8b376d62d8
Integrate Egbert's /etc/init.d/xdm changes + cleanup + update to 3.1.90 OBS-URL: https://build.opensuse.org/request/show/81172 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=173
53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
Index: gdm-3.1.90/configure.ac
|
|
===================================================================
|
|
--- gdm-3.1.90.orig/configure.ac
|
|
+++ gdm-3.1.90/configure.ac
|
|
@@ -1045,6 +1045,14 @@ fi
|
|
AC_SUBST(GDM_CUSTOM_CONF)
|
|
AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf')
|
|
|
|
+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 ---------------------------------------------------------------------------
|
|
@@ -1497,6 +1505,7 @@ echo "
|
|
dmconfdir: ${dmconfdir}
|
|
localstatedir: ${localstatedir}
|
|
datadir: ${datadir}
|
|
+ consolekit location: ${with_consolekit_directory}
|
|
source code location: ${srcdir}
|
|
compiler: ${CC}
|
|
cflags: ${CFLAGS}
|
|
Index: gdm-3.1.90/daemon/Makefile.am
|
|
===================================================================
|
|
--- gdm-3.1.90.orig/daemon/Makefile.am
|
|
+++ gdm-3.1.90/daemon/Makefile.am
|
|
@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
|
|
-DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
|
|
-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
|
|
-DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
|
|
+ -DCONSOLEKIT_DIR=\"$(CONSOLEKIT_DIR)\" \
|
|
$(DISABLE_DEPRECATED_CFLAGS) \
|
|
$(DAEMON_CFLAGS) \
|
|
$(XLIB_CFLAGS) \
|
|
Index: gdm-3.1.90/daemon/gdm-server.c
|
|
===================================================================
|
|
--- gdm-3.1.90.orig/daemon/gdm-server.c
|
|
+++ gdm-3.1.90/daemon/gdm-server.c
|
|
@@ -134,7 +134,7 @@ _gdm_server_query_ck_for_display_device
|
|
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);
|