Bug 388743 - "build dbus on linux by default (--enable-dbus) to auto-detect online/offline state" [p=steffen.wilberg@web.de (Steffen Wilberg) r=luser a1.9=schrep]

configure.in

@@ -4998,26 +4998,16 @@ dnl ========================================================
 
 if test "$MOZ_ENABLE_GTK2"
 then
-    MOZ_ARG_ENABLE_BOOL(dbus,
-    [  --enable-dbus       Enable dbus support (default: disabled) ],
-        MOZ_ENABLE_DBUS=force,
-        MOZ_ENABLE_DBUS=)
+    MOZ_ENABLE_DBUS=1
+
+    MOZ_ARG_DISABLE_BOOL(dbus,
+    [  --disable-dbus       Disable dbus support ],
+        MOZ_ENABLE_DBUS=,
+        MOZ_ENABLE_DBUS=1)
 
     if test "$MOZ_ENABLE_DBUS"
     then
-        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 >= $DBUS_VERSION])
-            fi
-            MOZ_ENABLE_DBUS=
-        ])
-    fi
-
-    if test "$MOZ_ENABLE_DBUS"; then
+        PKG_CHECK_MODULES(MOZ_DBUS_GLIB, dbus-glib-1 >= $DBUS_VERSION)
         AC_DEFINE(MOZ_ENABLE_DBUS)
     fi
 fi