91 lines
3.9 KiB
Diff
91 lines
3.9 KiB
Diff
diff --git a/configure.ac b/configure.ac
|
|
index 8cd83c6..915b532 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -982,6 +982,22 @@ fi
|
|
AC_SUBST(GDM_CUSTOM_CONF)
|
|
AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf')
|
|
|
|
+AC_ARG_WITH(gnome-settings-daemon-directory,
|
|
+ [AC_HELP_STRING([--with-gnome-settings-daemon-directory],
|
|
+ [Specify the directory of gnome-settings-daemon @<:@default=libexecdir@:>@])],,
|
|
+ [with_gnome_settings_daemon_directory="\${libexecdir}"])
|
|
+
|
|
+GNOME_SETTINGS_DAEMON_DIR=$with_gnome_settings_daemon_directory
|
|
+AC_SUBST(GNOME_SETTINGS_DAEMON_DIR)
|
|
+
|
|
+AC_ARG_WITH(consolekit-directory,
|
|
+ [AC_HELP_STRING([--with-consolekit-directory],
|
|
+ [Specify the directory of ck-get-x11-display-device @<:@default=libexecdir@:>@])],,
|
|
+ [with_consolekit_directory="\${libexecdir}"])
|
|
+
|
|
+CONSOLEKIT_DIR=$with_consolekit_directory
|
|
+AC_SUBST(CONSOLEKIT_DIR)
|
|
+
|
|
dnl ---------------------------------------------------------------------------
|
|
dnl - Check for XEvIE extension support
|
|
dnl ---------------------------------------------------------------------------
|
|
@@ -1386,6 +1402,8 @@ echo "
|
|
dmconfdir: ${dmconfdir}
|
|
localstatedir: ${localstatedir}
|
|
datadir: ${datadir}
|
|
+ g-s-d location: ${with_gnome_settings_daemon_directory}
|
|
+ consolekit location: ${with_consolekit_directory}
|
|
source code location: ${srcdir}
|
|
compiler: ${CC}
|
|
cflags: ${CFLAGS}
|
|
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
|
|
index 3daf924..10b0bd8 100644
|
|
--- a/daemon/Makefile.am
|
|
+++ b/daemon/Makefile.am
|
|
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
|
|
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
|
-DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \
|
|
-DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
|
|
+ -DCONSOLEKIT_DIR=\"$(CONSOLEKIT_DIR)\" \
|
|
$(DISABLE_DEPRECATED_CFLAGS) \
|
|
$(DAEMON_CFLAGS) \
|
|
$(XLIB_CFLAGS) \
|
|
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
|
|
index ba10386..d3476e7 100644
|
|
--- a/daemon/gdm-server.c
|
|
+++ b/daemon/gdm-server.c
|
|
@@ -127,7 +127,7 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
|
|
g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
|
|
|
|
error = NULL;
|
|
- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
|
|
+ command = g_strdup_printf (CONSOLEKIT_DIR "/ck-get-x11-display-device --display %s",
|
|
server->priv->display_name);
|
|
|
|
g_debug ("GdmServer: Running helper %s", command);
|
|
diff --git a/data/greeter-autostart/Makefile.am b/data/greeter-autostart/Makefile.am
|
|
index 2f45a74..ea90455 100644
|
|
--- a/data/greeter-autostart/Makefile.am
|
|
+++ b/data/greeter-autostart/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|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g'
|
|
|
|
%.desktop.in: %.desktop.in.in Makefile
|
|
$(edit) $< >$@
|
|
diff --git a/data/greeter-autostart/gnome-settings-daemon.desktop.in.in b/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
|
|
index b4b31e1..45131c9 100644
|
|
--- a/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
|
|
+++ b/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
|
|
@@ -1,8 +1,8 @@
|
|
[Desktop Entry]
|
|
Type=Application
|
|
_Name=GNOME Settings Daemon
|
|
-TryExec=@LIBEXECDIR@/gnome-settings-daemon
|
|
-Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
|
|
+TryExec=@GNOME_SETTINGS_DAEMON_DIR@/gnome-settings-daemon
|
|
+Exec=@GNOME_SETTINGS_DAEMON_DIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
|
|
OnlyShowIn=GNOME;
|
|
X-GNOME-Autostart-Phase=Initialization
|
|
X-GNOME-Autostart-Notify=true
|