Bug 901251 - Make --disable-necko-wifi actually work on Linux. r=glandium, a=akeybl
authorJan Beich <jbeich@tormail.org>
Mon, 05 Aug 2013 20:24:05 -0400
changeset 153669 e21f27c948358aeabf652e6bf7f01543f91a073a
parent 153668 b62f2b0fdb9d4519c289d79787b572d9c4e66e9e
child 153670 67a933f6521ff4976544052387acb6ea609c007e
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, akeybl
bugs901251
milestone25.0a2
Bug 901251 - Make --disable-necko-wifi actually work on Linux. r=glandium, a=akeybl
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8401,30 +8401,30 @@ case "$OS_TARGET" in
     if test -n "$gonkdir"; then
       NECKO_WIFI=1
     fi
     ;;
   Darwin|SunOS|WINNT)
     NECKO_WIFI=1
     ;;
   Linux)
-    if test -z "$MOZ_ENABLE_DBUS"; then
-      AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
-    fi
     NECKO_WIFI=1
     NECKO_WIFI_DBUS=1
     ;;
 esac
 
 MOZ_ARG_DISABLE_BOOL(necko-wifi,
 [  --disable-necko-wifi    Disable necko wifi scanner],
     NECKO_WIFI=,
     NECKO_WIFI=1)
 
 if test "$NECKO_WIFI"; then
+  if test -z "$MOZ_ENABLE_DBUS" -a -n "$NECKO_WIFI_DBUS"; then
+    AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
+  fi
   AC_DEFINE(NECKO_WIFI)
   _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
 fi
 AC_SUBST(NECKO_WIFI)
 AC_SUBST(NECKO_WIFI_DBUS)
 
 dnl
 dnl option to disable cookies