Bug 1746294 - Move --disable-necko-wifi to python configure. r=firefox-build-system-reviewers,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D133967

build/moz.configure/old.configure

@@ -96,7 +96,6 @@ def old_configure_options(*options):
     "--enable-extensions",
     "--enable-libproxy",
     "--enable-logrefcnt",
-    "--enable-necko-wifi",
     "--enable-negotiateauth",
     "--enable-official-branding",
     "--enable-parental-controls",

old-configure.in

@@ -1956,45 +1956,6 @@ AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
 
 AC_SUBST(MOZ_TREE_PIXMAN)
 
-dnl ========================================================
-dnl necko configuration options
-dnl ========================================================
-
-dnl
-dnl option to disable necko's wifi scanner
-dnl
-
-if test "$MOZ_WIDGET_TOOLKIT"; then
-
-  case "$OS_TARGET" in
-    Darwin)
-      NECKO_WIFI=1
-      ;;
-    DragonFly|FreeBSD|WINNT)
-      NECKO_WIFI=1
-      ;;
-    Linux)
-      NECKO_WIFI=1
-      NECKO_WIFI_DBUS=1
-      ;;
-  esac
-
-fi
-
-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)
-fi
-AC_SUBST(NECKO_WIFI)
-AC_SUBST(NECKO_WIFI_DBUS)
-
 dnl ========================================================
 dnl =
 dnl = Maintainer debug option (no --enable equivalent)

toolkit/moz.configure

@@ -2681,4 +2681,35 @@ with only_when(toolkit_gtk):
 
         set_config("MOZ_ENABLE_DBUS", True)
         set_define("MOZ_ENABLE_DBUS", True)
-        add_old_configure_assignment("MOZ_ENABLE_DBUS", True)
+
+
+# Necko's wifi scanner
+# ==============================================================
+@depends(target)
+def necko_wifi_when(target):
+    return target.os in ("WINNT", "OSX", "DragonFly", "FreeBSD") or (
+        target.kernel == "Linux" and target.os == "GNU"
+    )
+
+
+option("--disable-necko-wifi", help="Disable necko wifi scanner", when=necko_wifi_when)
+
+set_config("NECKO_WIFI", True, when="--enable-necko-wifi")
+set_define("NECKO_WIFI", True, when="--enable-necko-wifi")
+
+
+@depends(
+    depends("--enable-necko-wifi", when=necko_wifi_when)(lambda x: x),
+    depends("--enable-dbus", when=toolkit_gtk)(lambda x: x),
+    when=depends(target)(lambda t: t.os == "GNU" and t.kernel == "Linux"),
+)
+def necko_wifi_dbus(necko_wifi, dbus):
+    if necko_wifi and not dbus:
+        die(
+            "Necko WiFi scanning needs DBus on your platform, remove --disable-dbus"
+            " or use --disable-necko-wifi"
+        )
+    return necko_wifi and dbus
+
+
+set_config("NECKO_WIFI_DBUS", True, when=necko_wifi_dbus)