diff options
| author | Michael Biebl <biebl@debian.org> | 2009-09-01 01:30:54 +0200 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2009-09-13 13:38:32 -0400 |
| commit | 898c8cad6fa50ad4187ebdb63e742c767ae6591a (patch) | |
| tree | 3fd45b92a9bab3444e3db0cf3e7f1c14ea6a5fd2 | |
| parent | 0caf7cb9856a36bbdc6936e50389c931d4327ef0 (diff) | |
| download | polkit-898c8cad6fa50ad4187ebdb63e742c767ae6591a.tar.gz | |
Remove POLKIT_USER option
PK 1.0 no longer uses a separate user, so remove this ./configure option
which also means we no longer have to mangle the dbus policy file.
Signed-off-by: David Zeuthen <davidz@redhat.com>
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | data/Makefile.am | 14 | ||||
| -rw-r--r-- | data/org.freedesktop.PolicyKit1.conf (renamed from data/org.freedesktop.PolicyKit1.conf.in) | 0 |
3 files changed, 3 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 77b5055..4c2dd79 100644 --- a/configure.ac +++ b/configure.ac @@ -149,19 +149,6 @@ if test "x$GCC" = "xyes"; then fi dnl --------------------------------------------------------------------------- -dnl - User -dnl --------------------------------------------------------------------------- - -AC_ARG_WITH(polkit_user,[ --with-polkit-user=<user> user for PolicyKit]) -if test -z "$with_polkit_user" ; then - POLKIT_USER=polkituser -else - POLKIT_USER=$with_polkit_user -fi -AC_SUBST(POLKIT_USER) -AC_DEFINE_UNQUOTED(POLKIT_USER, "$POLKIT_USER", [User for PolicyKit]) - -dnl --------------------------------------------------------------------------- dnl - Select which authentication framework to use dnl --------------------------------------------------------------------------- diff --git a/data/Makefile.am b/data/Makefile.am index 0a6b4d8..f0beeba 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,11 +10,7 @@ $(service_DATA): $(service_in_files) Makefile @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ dbusconfdir = $(sysconfdir)/dbus-1/system.d -dbusconf_in_files = org.freedesktop.PolicyKit1.conf.in -dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf) - -$(dbusconf_DATA): $(dbusconf_in_files) Makefile - @sed -e "s|\@polkituser\@|$(POLKIT_USER)|" $< > $@ +dbusconf_DATA = org.freedesktop.PolicyKit1.conf if POLKIT_AUTHFW_PAM pamdir = $(sysconfdir)/pam.d @@ -30,13 +26,9 @@ EXTRA_DIST = \ org.freedesktop.PolicyKit1.Authority.xml \ org.freedesktop.PolicyKit1.AuthenticationAgent.xml \ $(service_in_files) \ - $(dbusconf_in_files) \ - polkit-1.in \ - polkit-gobject-1.pc.in \ - polkit-backend-1.pc.in \ - polkit-agent-1.pc.in \ + $(dbusconf_DATA) \ $(NULL) clean-local : - rm -f *~ $(service_DATA) $(dbusconf_DATA) + rm -f *~ $(service_DATA) diff --git a/data/org.freedesktop.PolicyKit1.conf.in b/data/org.freedesktop.PolicyKit1.conf index c8ef513..c8ef513 100644 --- a/data/org.freedesktop.PolicyKit1.conf.in +++ b/data/org.freedesktop.PolicyKit1.conf |