diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-03-13 08:55:45 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-03-13 08:55:45 +0000 |
| commit | d4ce0120d97731bc7acfc830e8043dae569b47ce (patch) | |
| tree | fbd5d15d63413e1a03a4c1de7a4e2e13ba5d79ae /configure.ac | |
| parent | eb8b4011449cec2ec5827c976a15b9262c74174e (diff) | |
| download | gdm-d4ce0120d97731bc7acfc830e8043dae569b47ce.tar.gz | |
No longer link with dbus unless ConsoleKit is enabled. Patch by William
2006-03-13 Brian Cameron <brian.cameron@sun.com>
* configure.ac, daemon/Makefile.am: No longer link with dbus
unless ConsoleKit is enabled. Patch by William Jon McCann
<mccann@jhu.edu>.
svn path=/trunk/; revision=4673
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 9994ebdd..ed652de4 100644 --- a/configure.ac +++ b/configure.ac @@ -176,7 +176,7 @@ PKG_CHECK_MODULES(VICIOUS, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_R AC_SUBST(VICIOUS_CFLAGS) AC_SUBST(VICIOUS_LIBS) -PKG_CHECK_MODULES(DAEMON, gtk+-2.0 >= $GTK_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) +PKG_CHECK_MODULES(DAEMON, gtk+-2.0 >= $GTK_REQUIRED) AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LIBS) @@ -804,10 +804,13 @@ fi use_console_kit=no if test "x$with_console_kit" != "xno" ; then use_console_kit=yes + PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_REQUIRED) AC_DEFINE(WITH_CONSOLE_KIT, 1, [Define to enable ConsoleKit support]) fi AM_CONDITIONAL(WITH_CONSOLE_KIT, test x$use_console_kit = xyes) AC_SUBST(WITH_CONSOLE_KIT) +AC_SUBST(DBUS_CFLAGS) +AC_SUBST(DBUS_LIBS) # # Subst the extra libs |