[gdm] Add an ability to choose polkit-gnome libexecdir

[Ray Strode <halfline src gnome org>]

commit e24a0030f7e3ac3b3f5582ebd293036f766937ec
Author: Armin Krejzi <krejzi email com>
Date:   Tue Sep 4 10:25:17 2012 -0400

    Add an ability to choose polkit-gnome libexecdir
    
    Following git commit b558e17960cf44323245a7bad425c2b6ed346a63
    which adds an ability to choose gnome-settings-daemon and
    consolekit install location so it does not assume everyone uses
    /usr/libexec as libexecdir, this commit does the same
    for polkit-gnome-authentication-agent-1.

 configure.ac                                       |    9 +++++++++
 data/applications/Makefile.am                      |    3 ++-
 ...lkit-gnome-authentication-agent-1.desktop.in.in |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 646cb4d..ba1a3c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1117,6 +1117,14 @@ AC_ARG_WITH(check-accelerated-directory,
 CHECK_ACCELERATED_DIR=$with_check_accelerated_directory
 AC_SUBST(CHECK_ACCELERATED_DIR)
 
+AC_ARG_WITH(authentication-agent-directory,
+              [AC_HELP_STRING([--with-authentication-agent-directory],
+                              [Specify the directory of polkit-gnome-authentication-agent-1 @<:@default=libexecdir@:>@])],,
+                              [with_authentication_agent_directory="\${libexecdir}"])
+
+AUTHENTICATION_AGENT_DIR=$with_authentication_agent_directory
+AC_SUBST(AUTHENTICATION_AGENT_DIR)
+
 dnl ---------------------------------------------------------------------------
 dnl - Check for XEvIE extension support
 dnl ---------------------------------------------------------------------------
@@ -1567,6 +1575,7 @@ echo "
         datadir:                  ${datadir}
 	consolekit location:      ${with_consolekit_directory}
 	gnome-session-check-accel location: ${with_check_accelerated_directory}
+	polkit-gnome location:    ${with_authentication_agent_directory}
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}
 	cflags:		          ${CFLAGS}
diff --git a/data/applications/Makefile.am b/data/applications/Makefile.am
index 05408aa..3941e49 100644
--- a/data/applications/Makefile.am
+++ b/data/applications/Makefile.am
@@ -5,7 +5,8 @@ edit = sed \
 	-e 's|@SYSCONFDIR[ ]|$(sysconfdir)|g' \
 	-e 's|@LIBDIR[ ]|$(libdir)|g' \
 	-e 's|@LIBEXECDIR[ ]|$(libexecdir)|g' \
-	-e 's|@LOCALSTATEDIR[ ]|$(localstatedir)|g'
+	-e 's|@LOCALSTATEDIR[ ]|$(localstatedir)|g' \
+	-e 's,[ ]AUTHENTICATION_AGENT_DIR[@],$(AUTHENTICATION_AGENT_DIR),g'
 
 %.desktop.in: %.desktop.in.in Makefile
 	$(edit) $< >$@
diff --git a/data/applications/polkit-gnome-authentication-agent-1.desktop.in.in b/data/applications/polkit-gnome-authentication-agent-1.desktop.in.in
index a390cd2..b00317d 100644
--- a/data/applications/polkit-gnome-authentication-agent-1.desktop.in.in
+++ b/data/applications/polkit-gnome-authentication-agent-1.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
 _Name=PolicyKit Authentication Agent
-Exec= LIBEXECDIR@/polkit-gnome-authentication-agent-1
+Exec= AUTHENTICATION_AGENT_DIR@/polkit-gnome-authentication-agent-1
 OnlyShowIn=GNOME;