diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d933529579..621296b6cf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6369,8 +6369,10 @@ nodist_polkitpolicy_DATA = \ $(polkitpolicy_files) \ $(polkitpolicy_in_in_files:.policy.in.in=.policy) polkitrules_DATA = $(polkitrules_files) +if ENABLE_POLKIT_PKLA polkitpkla_DATA = $(polkitpkla_files) endif +endif EXTRA_DIST += \ $(polkitpolicy_in_files) \ diff --git a/configure.ac b/configure.ac index 3835413ad5..1efeb3a73e 100644 --- a/configure.ac +++ b/configure.ac @@ -1228,8 +1228,14 @@ AC_ARG_ENABLE(polkit, AS_HELP_STRING([--disable-polkit], [disable PolicyKit supp if test "x$enable_polkit" != "xno"; then AC_DEFINE(ENABLE_POLKIT, 1, [Define if PolicyKit support is to be enabled]) have_polkit=yes + + # also enable support for *.pkla files on old polkit + PKG_CHECK_MODULES(POLKIT, [ polkit-gobject-1 < 0.106 ], + [polkit_pkla=yes], + [polkit_pkla=no]) fi AM_CONDITIONAL(ENABLE_POLKIT, [test "x$have_polkit" = "xyes"]) +AM_CONDITIONAL(ENABLE_POLKIT_PKLA, [test "x$polkit_pkla" = "xyes"]) # ------------------------------------------------------------------------------ have_resolved=no @@ -1700,7 +1706,7 @@ AC_MSG_RESULT([ default DNS servers: ${DNS_SERVERS} default DNSSEC mode: ${DEFAULT_DNSSEC_MODE} coredump: ${have_coredump} - polkit: ${have_polkit} + polkit: ${have_polkit} (legacy pkla support: ${polkit_pkla}) efi: ${have_efi} gnuefi: ${have_gnuefi} efi arch: ${EFI_ARCH} |