diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | data/Makefile.am | 3 | ||||
| -rw-r--r-- | data/ModemManager.service.in | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d3c9beba..667fb9d0 100644 --- a/configure.ac +++ b/configure.ac @@ -288,6 +288,7 @@ elif test "x$with_polkit" = "xyes"; then with_polkit=strict fi +MM_POLKIT_SERVICE="" if test "x$with_polkit" != "xno"; then if test "x$have_polkit" = "xno"; then AC_MSG_ERROR(PolicyKit development headers are required) @@ -296,9 +297,11 @@ if test "x$with_polkit" != "xno"; then case "x$with_polkit" in "xpermissive") MM_DEFAULT_USER_POLICY="yes" + MM_POLKIT_SERVICE="polkit.service" ;; "xstrict") MM_DEFAULT_USER_POLICY="auth_self_keep" + MM_POLKIT_SERVICE="polkit.service" ;; *) AC_MSG_ERROR([Wrong value for --with-polkit: $with_polkit]) @@ -311,6 +314,7 @@ if test "x$with_polkit" != "xno"; then AC_SUBST(MM_DEFAULT_USER_POLICY) fi +AC_SUBST(MM_POLKIT_SERVICE) AM_CONDITIONAL(WITH_POLKIT, [test "x$with_polkit" != "xno"]) dnl----------------------------------------------------------------------------- diff --git a/data/Makefile.am b/data/Makefile.am index ee05bdf6..447cb3d0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,7 +5,8 @@ edit = @sed \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ - -e 's|@libexecdir[@]|$(libexecdir)|g' + -e 's|@libexecdir[@]|$(libexecdir)|g' \ + -e 's|@MM_POLKIT_SERVICE[@]|$(MM_POLKIT_SERVICE)|g' # DBus Service file diff --git a/data/ModemManager.service.in b/data/ModemManager.service.in index 420d22b1..23bf8091 100644 --- a/data/ModemManager.service.in +++ b/data/ModemManager.service.in @@ -1,5 +1,7 @@ [Unit] Description=Modem Manager +After=@MM_POLKIT_SERVICE@ +Requires=@MM_POLKIT_SERVICE@ [Service] Type=dbus |