diff -Naur gdm-2.26.1-orig/configure.ac gdm-2.26.1/configure.ac
--- gdm-2.26.1-orig/configure.ac	2009-03-16 14:50:10.000000000 -0500
+++ gdm-2.26.1/configure.ac	2009-09-26 16:15:24.000000000 -0500
@@ -875,6 +875,8 @@
 if test "x$with_console_kit" != "xno" ; then
 	use_console_kit=yes
 	AC_DEFINE(WITH_CONSOLE_KIT, 1, [Define to enable ConsoleKit support])
+	CK_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir ck-connector`
+	AC_SUBST(CK_LIBEXECDIR)
 fi
 AM_CONDITIONAL(WITH_CONSOLE_KIT, test x$use_console_kit = xyes)
 AC_SUBST(WITH_CONSOLE_KIT)
@@ -1318,6 +1327,10 @@
 
 # Set configuration choices.
 #
+GSD_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir gnome-settings-daemon`
+AC_SUBST(GSD_LIBEXECDIR)
+DBUS_DAEMON_DIR=`$PKG_CONFIG --variable=daemondir dbus-1`
+AC_SUBST(DBUS_DAEMON_DIR)
 AC_SUBST(XSESSION_SHELL)
 AC_DEFINE_UNQUOTED(XSESSION_SHELL,"$XSESSION_SHELL",[xsession shell])
 AC_SUBST(SOUND_PROGRAM)
diff -Naur gdm-2.26.1-orig/daemon/gdm-server.c gdm-2.26.1/daemon/gdm-server.c
--- gdm-2.26.1-orig/daemon/gdm-server.c	2009-03-16 15:03:19.000000000 -0500
+++ gdm-2.26.1/daemon/gdm-server.c	2009-09-26 16:15:24.000000000 -0500
@@ -127,7 +127,7 @@
         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 (CK_LIBEXECDIR "/ck-get-x11-display-device --display %s",
                                    server->priv->display_name);
 
         g_debug ("GdmServer: Running helper %s", command);
diff -Naur gdm-2.26.1-orig/daemon/gdm-welcome-session.c gdm-2.26.1/daemon/gdm-welcome-session.c
--- gdm-2.26.1-orig/daemon/gdm-welcome-session.c	2009-03-16 15:03:19.000000000 -0500
+++ gdm-2.26.1/daemon/gdm-welcome-session.c	2009-09-26 16:15:24.000000000 -0500
@@ -46,7 +46,7 @@
 
 #include "gdm-welcome-session.h"
 
-#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"
+#define DBUS_LAUNCH_COMMAND DBUS_DAEMON_DIR "/dbus-launch --exit-with-session"
 
 #define MAX_LOGS 5
 
diff -Naur gdm-2.26.1-orig/daemon/Makefile.am gdm-2.26.1/daemon/Makefile.am
--- gdm-2.26.1-orig/daemon/Makefile.am	2009-02-19 20:45:14.000000000 -0600
+++ gdm-2.26.1/daemon/Makefile.am	2009-09-26 16:15:24.000000000 -0500
@@ -6,7 +6,9 @@
 	-I$(top_srcdir)/common				\
 	-DAUTHDIR=\"$(authdir)\"			\
 	-DBINDIR=\"$(bindir)\"				\
+	-DCK_LIBEXECDIR=\"$(CK_LIBEXECDIR)\"		\
 	-DDATADIR=\"$(datadir)\"			\
+	-DDBUS_DAEMON_DIR=\"$(DBUS_DAEMON_DIR)\"	\
 	-DDMCONFDIR=\"$(dmconfdir)\"			\
 	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
 	-DLIBDIR=\"$(libdir)\"				\
diff -Naur gdm-2.26.1-orig/daemon/Makefile.in gdm-2.26.1/daemon/Makefile.in
--- gdm-2.26.1-orig/daemon/Makefile.in	2009-04-14 09:21:27.000000000 -0500
+++ gdm-2.26.1/daemon/Makefile.in	2009-09-26 16:15:24.000000000 -0500
@@ -240,6 +240,7 @@
 CFLAGS = @CFLAGS@
 CHECK_CFLAGS = @CHECK_CFLAGS@
 CHECK_LIBS = @CHECK_LIBS@
+CK_LIBEXECDIR = @CK_LIBEXECDIR@
 COMMON_CFLAGS = @COMMON_CFLAGS@
 COMMON_LIBS = @COMMON_LIBS@
 CPP = @CPP@
@@ -253,6 +254,7 @@
 DAEMON_LIBS = @DAEMON_LIBS@
 DATADIR = @DATADIR@
 DATADIRNAME = @DATADIRNAME@
+DBUS_DAEMON_DIR = @DBUS_DAEMON_DIR@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -464,7 +466,9 @@
 	-I$(top_srcdir)/common				\
 	-DAUTHDIR=\"$(authdir)\"			\
 	-DBINDIR=\"$(bindir)\"				\
+	-DCK_LIBEXECDIR=\"$(CK_LIBEXECDIR)\"		\
 	-DDATADIR=\"$(datadir)\"			\
+	-DDBUS_DAEMON_DIR=\"$(DBUS_DAEMON_DIR)\"	\
 	-DDMCONFDIR=\"$(dmconfdir)\"			\
 	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
 	-DLIBDIR=\"$(libdir)\"				\
diff -Naur gdm-2.26.1-orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.26.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
--- gdm-2.26.1-orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2009-02-19 20:45:14.000000000 -0600
+++ gdm-2.26.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2009-09-26 16:15:24.000000000 -0500
@@ -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=@GSD_LIBEXECDIR@/gnome-settings-daemon
+Exec=@GSD_LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
 OnlyShowIn=GNOME;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-Autostart-Notify=true
diff -Naur gdm-2.26.1-orig/data/greeter-autostart/Makefile.am gdm-2.26.1/data/greeter-autostart/Makefile.am
--- gdm-2.26.1-orig/data/greeter-autostart/Makefile.am	2009-02-19 20:45:14.000000000 -0600
+++ gdm-2.26.1/data/greeter-autostart/Makefile.am	2009-09-26 16:15:24.000000000 -0500
@@ -5,7 +5,8 @@
 	-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|@GSD_LIBEXECDIR[@]|$(GSD_LIBEXECDIR)|g'
 
 %.desktop.in: %.desktop.in.in Makefile
 	$(edit) $< >$@
diff -Naur gdm-2.26.1-orig/data/greeter-autostart/Makefile.in gdm-2.26.1/data/greeter-autostart/Makefile.in
--- gdm-2.26.1-orig/data/greeter-autostart/Makefile.in	2009-04-14 09:21:27.000000000 -0500
+++ gdm-2.26.1/data/greeter-autostart/Makefile.in	2009-09-26 16:15:24.000000000 -0500
@@ -133,6 +133,7 @@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSD_LIBEXECDIR = @GSD_LIBEXECDIR@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
diff -Naur gdm-2.26.1-orig/data/Makefile.in gdm-2.26.1/data/Makefile.in
--- gdm-2.26.1-orig/data/Makefile.in	2009-04-14 09:21:27.000000000 -0500
+++ gdm-2.26.1/data/Makefile.in	2009-09-26 16:15:24.000000000 -0500
@@ -147,6 +147,7 @@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSD_LIBEXECDIR = @GSD_LIBEXECDIR@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
diff -Naur gdm-2.26.1-orig/gui/Makefile.in gdm-2.26.1/gui/Makefile.in
--- gdm-2.26.1-orig/gui/Makefile.in	2009-04-14 09:21:28.000000000 -0500
+++ gdm-2.26.1/gui/Makefile.in	2009-09-26 16:15:24.000000000 -0500
@@ -135,6 +135,7 @@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSD_LIBEXECDIR = @GSD_LIBEXECDIR@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
diff -Naur gdm-2.26.1-orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.26.1/gui/simple-chooser/gdm-chooser-session.c
--- gdm-2.26.1-orig/gui/simple-chooser/gdm-chooser-session.c	2009-02-19 20:45:09.000000000 -0600
+++ gdm-2.26.1/gui/simple-chooser/gdm-chooser-session.c	2009-09-26 16:15:24.000000000 -0500
@@ -131,7 +131,7 @@
         ret = FALSE;
 
         error = NULL;
-        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
+        g_spawn_command_line_async (GSD_LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
         if (error != NULL) {
                 g_warning ("Error starting settings daemon: %s", error->message);
                 g_error_free (error);
diff -Naur gdm-2.26.1-orig/gui/simple-chooser/Makefile.am gdm-2.26.1/gui/simple-chooser/Makefile.am
--- gdm-2.26.1-orig/gui/simple-chooser/Makefile.am	2009-02-19 20:45:09.000000000 -0600
+++ gdm-2.26.1/gui/simple-chooser/Makefile.am	2009-09-26 16:15:24.000000000 -0500
@@ -8,6 +8,7 @@
 	-DDMCONFDIR=\""$(dmconfdir)"\"		 	\
 	-DGDMLOCALEDIR=\""$(gdmlocaledir)"\"		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+	-DGSD_LIBEXECDIR=\""$(GSD_LIBEXECDIR)"\"	\
 	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
 	-DSBINDIR=\""$(sbindir)"\"		 	\
 	-DPIXMAPDIR=\""$(pixmapdir)"\"		 	\
diff -Naur gdm-2.26.1-orig/gui/simple-chooser/Makefile.in gdm-2.26.1/gui/simple-chooser/Makefile.in
--- gdm-2.26.1-orig/gui/simple-chooser/Makefile.in	2009-04-14 09:21:28.000000000 -0500
+++ gdm-2.26.1/gui/simple-chooser/Makefile.in	2009-09-26 16:15:24.000000000 -0500
@@ -164,6 +164,7 @@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSD_LIBEXECDIR = @GSD_LIBEXECDIR@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -334,6 +335,7 @@
 	-DDMCONFDIR=\""$(dmconfdir)"\"		 	\
 	-DGDMLOCALEDIR=\""$(gdmlocaledir)"\"		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+	-DGSD_LIBEXECDIR=\""$(GSD_LIBEXECDIR)"\"		\
 	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
 	-DSBINDIR=\""$(sbindir)"\"		 	\
 	-DPIXMAPDIR=\""$(pixmapdir)"\"		 	\
diff -Naur gdm-2.26.1-orig/Makefile.in gdm-2.26.1/Makefile.in
--- gdm-2.26.1-orig/Makefile.in	2009-04-14 09:21:29.000000000 -0500
+++ gdm-2.26.1/Makefile.in	2009-09-26 16:16:16.000000000 -0500
@@ -94,6 +94,7 @@
 CFLAGS = @CFLAGS@
 CHECK_CFLAGS = @CHECK_CFLAGS@
 CHECK_LIBS = @CHECK_LIBS@
+CK_LIBEXECDIR = @CK_LIBEXECDIR@
 COMMON_CFLAGS = @COMMON_CFLAGS@
 COMMON_LIBS = @COMMON_LIBS@
 CPP = @CPP@
@@ -107,6 +108,7 @@
 DAEMON_LIBS = @DAEMON_LIBS@
 DATADIR = @DATADIR@
 DATADIRNAME = @DATADIRNAME@
+DBUS_DAEMON_DIR = @DBUS_DAEMON_DIR@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -150,6 +152,7 @@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSD_LIBEXECDIR = @GSD_LIBEXECDIR@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
