diff options
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 74 |
1 files changed, 46 insertions, 28 deletions
diff --git a/old-configure.in b/old-configure.in index 80597eb73..6b88a00af 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= @@ -2247,6 +2249,7 @@ MOZ_PLACES=1 MOZ_SERVICES_HEALTHREPORT=1 MOZ_SERVICES_SYNC=1 MOZ_SERVICES_CLOUDSYNC=1 +MOZ_USERINFO=1 case "$target_os" in mingw*) @@ -3344,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 @@ -3693,10 +3695,10 @@ if test "$MOZ_IOS"; then MOZ_UPDATER= fi -MOZ_ARG_DISABLE_BOOL(updater, -[ --disable-updater Disable building of updater], - MOZ_UPDATER=, - MOZ_UPDATER=1 ) +MOZ_ARG_ENABLE_BOOL(updater, +[ --enable-updater Enable building of internal updater], + MOZ_UPDATER=1, + MOZ_UPDATER= ) if test -n "$MOZ_UPDATER"; then AC_DEFINE(MOZ_UPDATER) @@ -4587,6 +4589,20 @@ fi AC_SUBST(MOZ_DEVTOOLS) dnl ======================================================== +dnl = Disable nsUserInfo +dnl ======================================================== +MOZ_ARG_DISABLE_BOOL(userinfo, +[ --disable-userinfo Disable nsUserInfo (default=enabled)], + MOZ_USERINFO=, + MOZ_USERINFO=1) + +if test -n "$MOZ_USERINFO"; then + AC_DEFINE(MOZ_USERINFO) +fi + +AC_SUBST(MOZ_USERINFO) + +dnl ======================================================== dnl = Define default location for MOZILLA_FIVE_HOME dnl ======================================================== MOZ_ARG_WITH_STRING(default-mozilla-five-home, @@ -4983,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 |