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>

diff --git a/configure.ac b/configure.ac
index 77b5055..4c2dd79 100644 (file)
--- 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 (file)
--- 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
similarity index 100%
rename from data/org.freedesktop.PolicyKit1.conf.in
rename to data/org.freedesktop.PolicyKit1.conf