summaryrefslogtreecommitdiffstats
path: root/old-configure.in
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-11-08 15:25:03 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-11-08 15:25:03 +0100
commitb84d9c12e3dbe6e7c6006ed9a40703fb83611266 (patch)
treed277ec8f70cb90cf022ced85f0697d0cb9aebe72 /old-configure.in
parent13ee68cbc657b6ca956717749c8afa647a8557b8 (diff)
downloadUXP-b84d9c12e3dbe6e7c6006ed9a40703fb83611266.tar
UXP-b84d9c12e3dbe6e7c6006ed9a40703fb83611266.tar.gz
UXP-b84d9c12e3dbe6e7c6006ed9a40703fb83611266.tar.lz
UXP-b84d9c12e3dbe6e7c6006ed9a40703fb83611266.tar.xz
UXP-b84d9c12e3dbe6e7c6006ed9a40703fb83611266.zip
Revert "Move MOZ_GAMEPAD* and NECKO_WIFI up"
This reverts commit 13ee68cbc657b6ca956717749c8afa647a8557b8.
Diffstat (limited to 'old-configure.in')
-rw-r--r--old-configure.in39
1 files changed, 20 insertions, 19 deletions
diff --git a/old-configure.in b/old-configure.in
index c7ee53b94..d0b17835c 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2226,8 +2226,6 @@ MOZ_PREF_EXTENSIONS=1
MOZ_REFLOW_PERF=
MOZ_SAFE_BROWSING=
MOZ_SPELLCHECK=1
-MOZ_GAMEPAD=1
-MOZ_GAMEPAD_BACKEND=stub
MOZ_TOOLKIT_SEARCH=1
MOZ_UI_LOCALE=en-US
MOZ_UNIVERSALCHARDET=1
@@ -2266,23 +2264,6 @@ case "${target}" in
esac
-case "$OS_TARGET" in
- Android)
- ;;
- Darwin)
- if test -z "$MOZ_IOS"; then
- NECKO_WIFI=1
- fi
- ;;
- DragonFly|FreeBSD|WINNT)
- NECKO_WIFI=1
- ;;
- Linux)
- NECKO_WIFI=1
- NECKO_WIFI_DBUS=1
- ;;
-esac
-
# Optional Firefox for Android partner distribution directory.
MOZ_ARG_WITH_STRING(android-distribution-directory,
[ --with-android-distribution-directory=dir
@@ -3364,6 +3345,9 @@ fi # COMPILE_ENVIRONMENT
dnl ========================================================
dnl Gamepad support
dnl ========================================================
+MOZ_GAMEPAD=1
+MOZ_GAMEPAD_BACKEND=stub
+
MOZ_ARG_DISABLE_BOOL(gamepad,
[ --disable-gamepad Disable gamepad support],
MOZ_GAMEPAD=,
@@ -5014,6 +4998,23 @@ dnl
dnl option to disable necko's wifi scanner
dnl
+case "$OS_TARGET" in
+ Android)
+ ;;
+ Darwin)
+ if test -z "$MOZ_IOS"; then
+ NECKO_WIFI=1
+ fi
+ ;;
+ DragonFly|FreeBSD|WINNT)
+ NECKO_WIFI=1
+ ;;
+ Linux)
+ NECKO_WIFI=1
+ NECKO_WIFI_DBUS=1
+ ;;
+esac
+
MOZ_ARG_DISABLE_BOOL(necko-wifi,
[ --disable-necko-wifi Disable necko wifi scanner],
NECKO_WIFI=,