diff options
| author | Laurent Bigonville <bigon@bigon.be> | 2013-11-11 01:05:29 +0100 |
|---|---|---|
| committer | Laurent Bigonville <bigon@bigon.be> | 2013-11-11 18:09:55 +0100 |
| commit | 8b858821f75cfb3428fd8a6d98b101333dd5e105 (patch) | |
| tree | 441f54586807e5c2613bd14c3c82ec06a92e6bd7 | |
| parent | 87f181489983bb8d640a6a227caa8cbfc0fff853 (diff) | |
| download | gdm-8b858821f75cfb3428fd8a6d98b101333dd5e105.tar.gz | |
Add configure option to specify gnome-settings-daemon location
Add --with-gnome-settings-daemon-directory option to allow one to pass
location for the gnome-settings-daemon executable used by the chooser
https://bugzilla.gnome.org/show_bug.cgi?id=645918
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | gui/simple-chooser/Makefile.am | 1 | ||||
| -rw-r--r-- | gui/simple-chooser/gdm-chooser-session.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0008c62f..fdb0497a 100644 --- a/configure.ac +++ b/configure.ac @@ -1101,6 +1101,14 @@ AC_ARG_WITH(consolekit-directory, CONSOLEKIT_DIR=$with_consolekit_directory AC_SUBST(CONSOLEKIT_DIR) +AC_ARG_WITH(gnome-settings-daemon-directory, + [AC_HELP_STRING([--with-gnome-settings-daemon-directory], + [Specify the directory of gnome-settings-daemon used by the chooser @<:@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(check-accelerated-directory, [AC_HELP_STRING([--with-check-accelerated-directory], [Specify the directory of gnome-session-check-accelerated @<:@default=libexecdir@:>@])],, @@ -1591,6 +1599,7 @@ echo " localstatedir: ${localstatedir} datadir: ${datadir} consolekit location: ${with_consolekit_directory} + gnome-settings-daemon location: ${with_gnome_settings_daemon_directory} gnome-session-check-accel location: ${with_check_accelerated_directory} polkit-gnome location: ${with_authentication_agent_directory} source code location: ${srcdir} diff --git a/gui/simple-chooser/Makefile.am b/gui/simple-chooser/Makefile.am index 18168e77..7e8e782a 100644 --- a/gui/simple-chooser/Makefile.am +++ b/gui/simple-chooser/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ -DSBINDIR=\""$(sbindir)"\" \ -DPIXMAPDIR=\""$(pixmapdir)"\" \ -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ + -DGNOME_SETTINGS_DAEMON_DIR="\"$(GNOME_SETTINGS_DAEMON_DIR)\"" \ $(GTK_CFLAGS) \ $(XLIB_CFLAGS) \ $(XDMCP_CFLAGS) \ diff --git a/gui/simple-chooser/gdm-chooser-session.c b/gui/simple-chooser/gdm-chooser-session.c index 1bc7071e..dd618b8a 100644 --- a/gui/simple-chooser/gdm-chooser-session.c +++ b/gui/simple-chooser/gdm-chooser-session.c @@ -133,7 +133,7 @@ start_settings_daemon (GdmChooserSession *session) ret = FALSE; error = NULL; - g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); + g_spawn_command_line_async (GNOME_SETTINGS_DAEMON_DIR "/gnome-settings-daemon", &error); if (error != NULL) { g_warning ("Error starting settings daemon: %s", error->message); g_error_free (error); |