diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 13 insertions, 7 deletions
@@ -1,6 +1,12 @@ 2005-01-10 Christian Persch <chpe@cvs.gnome.org> * configure.ac: + + Fix dbus configure check to really default to off. + +2005-01-10 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: * lib/Makefile.am: A lib/ephy-dbus.c: A lib/ephy-dbus.h: diff --git a/configure.ac b/configure.ac index 61ca3b769..931e87ef8 100644 --- a/configure.ac +++ b/configure.ac @@ -487,22 +487,24 @@ dnl *************** AC_CHECK_HEADERS([X11/XF86keysym.h]) -dnl *********************************** -dnl Check for DBUS and DBUS net monitor -dnl *********************************** +dnl **** +dnl DBUS +dnl **** AC_MSG_CHECKING([whether DBUS support is requested]) enable_dbus=no AC_ARG_ENABLE([dbus], AS_HELP_STRING([--enable-dbus],[Enable DBUS (default=no)]), - [enable_dbus=yes], + [enable_dbus=$enableval], [enable_dbus=no]) +AC_MSG_RESULT([$enable_dbus]) + DBUS_REQUIRED=0.22 DBUS_GLIB_REQUIRED=0.22 -if test x"$enable_dbus" = "xyes" ; then +if test "x$enable_dbus" = "xyes" ; then AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled (default=disabled)]) PKG_CHECK_MODULES([DBUS], [dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) @@ -510,8 +512,6 @@ fi AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"]) -AC_MSG_RESULT([$enable_dbus]) - dnl ******************************* dnl Add warning flags dnl ******************************* |