aboutsummaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug803480
blob: c15992fa36f879bd1833a7d55e18a05b0f0244c5 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
diff --git configure.in configure.in
index fa283d0..936b6e0 100644
--- configure.in
+++ configure.in
@@ -8229,16 +8229,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
     NECKO_WIFI=,
     NECKO_WIFI=1)
 
-if test "$OS_ARCH" = "OS2"; then
-  dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-  NECKO_WIFI=
-fi
-if test "$NECKO_WIFI" -a \
-        "$OS_ARCH" != "Linux" -a \
-        "$OS_ARCH" != "Darwin" -a \
-        "$OS_ARCH" != "SunOS" -a \
-        "$OS_ARCH" != "WINNT"; then
-  AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
+if test "$NECKO_WIFI"; then
+  case "$OS_TARGET" in
+    Android)
+      ;;
+    Darwin)
+      ;;
+    SunOS)
+      ;;
+    WINNT)
+      ;;
+    OS2)
+      dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
+      NECKO_WIFI=
+      ;;
+    *)
+      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
+      ;;
+  esac
 fi
 
 if test "$NECKO_WIFI"; then