Bug 377992 - dbus build fails with some dbus versions, r=luser
authorwr@rosenauer.org
Thu, 19 Apr 2007 04:52:40 -0700
changeset 643 179f4dab290262d1fabd90459ba633a6271dd559
parent 642 f4cb0f4650e5c26d2ad4610f6f9ed994bf17a4a9
child 644 9851d6ebc1be9dc47f2cccc8bb41052ea6828694
push idunknown
push userunknown
push dateunknown
reviewersluser
bugs377992
milestone1.9a4pre
Bug 377992 - dbus build fails with some dbus versions, r=luser
configure.in
--- a/configure.in
+++ b/configure.in
@@ -122,16 +122,17 @@ GTK2_VERSION=1.3.7
 MAKE_VERSION=3.78
 WINDRES_VERSION=2.14.90
 W32API_VERSION=3.8
 GNOMEVFS_VERSION=2.0
 GNOMEUI_VERSION=2.2.0
 GCONF_VERSION=1.2.1
 LIBGNOME_VERSION=2.0
 STARTUP_NOTIFICATION_VERSION=0.8
+DBUS_VERSION=0.60
 
 MSMANIFEST_TOOL=
 
 dnl Set various checks
 dnl ========================================================
 MISSING_X=
 AC_PROG_AWK
 
@@ -5201,23 +5202,23 @@ then
 
     MOZ_ARG_DISABLE_BOOL(dbus,
     [  --disable-dbus       Disable dbus support (default: auto, optional at runtime) ],
         MOZ_ENABLE_DBUS=,
         MOZ_ENABLE_DBUS=force)
 
     if test "$MOZ_ENABLE_DBUS"
     then
-        PKG_CHECK_MODULES(MOZ_DBUS_GLIB, dbus-glib-1,
+        PKG_CHECK_MODULES(MOZ_DBUS_GLIB, dbus-glib-1 >= $DBUS_VERSION,
         [
             MOZ_ENABLE_DBUS=1
         ],[
             if test "$MOZ_ENABLE_DBUS" = "force"
             then
-                AC_MSG_ERROR([* * * Could not find dbus-glib-1])
+                AC_MSG_ERROR([* * * Could not find dbus-glib-1 >= $DBUS_VERSION])
             fi
             MOZ_ENABLE_DBUS=
         ])
     fi
 
     if test "$MOZ_ENABLE_DBUS"; then
         AC_DEFINE(MOZ_ENABLE_DBUS)
     fi