diff options
| author | Vincent Untz <vuntz@gnome.org> | 2012-08-27 21:36:43 +0200 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-08-27 15:39:48 -0400 |
| commit | b558e17960cf44323245a7bad425c2b6ed346a63 (patch) | |
| tree | dcdfa29d2d151f1355b69891cbd73ac744c436a4 /daemon | |
| parent | 9c727fb7553250b46fe368163bab5156c016bed7 (diff) | |
| download | gdm-b558e17960cf44323245a7bad425c2b6ed346a63.tar.gz | |
Add configure option to specify directory of some tools
Add --with-gnome-settings-daemon-directory and
--with-consolekit-directory for distributions that do not put
gnome-settings-daemon and ck-get-x11-display-device directly in
LIBEXECDIR.
Closes: bgo#582320
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/Makefile.am | 1 | ||||
| -rw-r--r-- | daemon/gdm-server.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 8e74620b..dae7f132 100644 --- a/daemon/Makefile.am +++ b/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) \ diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c index a0e62b09..e1e9c39e 100644 --- a/daemon/gdm-server.c +++ b/daemon/gdm-server.c @@ -147,7 +147,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); |