diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-08 15:44:08 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-08 15:44:08 +0100 |
| commit | ec5be3b4f1bb82dbd5b93251b557cabf6121ec65 (patch) | |
| tree | 495d5c553c741380cc4adbbb12d79b5e2ad7e084 /old-configure.in | |
| parent | b84d9c12e3dbe6e7c6006ed9a40703fb83611266 (diff) | |
| download | uxp-ec5be3b4f1bb82dbd5b93251b557cabf6121ec65.tar.gz | |
Improve handling of MOZ_GAMEPAD and NECKO_WIFI
- Make gamepad support disabled by default
- Add switch for confvars use for NECKO_WIFI
- Ensure both can be set from confvars.sh
This resolves #794 (bis)
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/old-configure.in b/old-configure.in index d0b17835c6..ee69eb39a8 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2222,6 +2222,7 @@ VPX_X86_ASM= VPX_ARM_ASM= LIBJPEG_TURBO_AS= LIBJPEG_TURBO_ASFLAGS= +MOZ_GAMEPAD= MOZ_PREF_EXTENSIONS=1 MOZ_REFLOW_PERF= MOZ_SAFE_BROWSING= @@ -2233,6 +2234,7 @@ MOZ_URL_CLASSIFIER= MOZ_XUL=1 MOZ_ZIPWRITER=1 MOZ_NO_SMART_CARDS= +MOZ_NECKO_WIFI=1 NECKO_COOKIES=1 MOZ_USE_NATIVE_POPUP_WINDOWS= MOZ_EXCLUDE_HYPHENATION_DICTIONARIES= @@ -3345,13 +3347,12 @@ 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=, - MOZ_GAMEPAD=1) +MOZ_ARG_ENABLE_BOOL(gamepad, +[ --enable-gamepad Enable gamepad support], + MOZ_GAMEPAD=1, + MOZ_GAMEPAD=) if test "$MOZ_GAMEPAD"; then case "$OS_TARGET" in @@ -4998,27 +4999,29 @@ 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=, - NECKO_WIFI=1) + MOZ_NECKO_WIFI=, + MOZ_NECKO_WIFI=1) + +if test "$MOZ_NECKO_WIFI"; then + 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 +fi if test "$NECKO_WIFI"; then if test -z "$MOZ_ENABLE_DBUS" -a -n "$NECKO_WIFI_DBUS"; then |