diff options
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 252 |
1 files changed, 96 insertions, 156 deletions
diff --git a/old-configure.in b/old-configure.in index d40305309..6638ea688 100644 --- a/old-configure.in +++ b/old-configure.in @@ -48,7 +48,7 @@ dnl ======================================================== MOZJPEG=62 MOZPNG=10625 NSPR_VERSION=4 -NSPR_MINVER=4.19 +NSPR_MINVER=4.20 NSS_VERSION=3 dnl Set the minimum version of toolkit libs used by mozilla @@ -68,7 +68,7 @@ GNOMEUI_VERSION=2.2.0 GCONF_VERSION=1.2.1 STARTUP_NOTIFICATION_VERSION=0.8 DBUS_VERSION=0.60 -SQLITE_VERSION=3.21.0 +SQLITE_VERSION=3.27.2 dnl Set various checks dnl ======================================================== @@ -215,11 +215,12 @@ case "$target" in # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146) CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-" - - # Disable C++11 thread-safe statics due to crashes on XP (bug 1204752) - # See https://connect.microsoft.com/VisualStudio/feedback/details/1789709/visual-c-2015-runtime-broken-on-windows-server-2003-c-11-magic-statics - CXXFLAGS="$CXXFLAGS -Zc:threadSafeInit-" - + + # C4752: We explicitly use AVX instructions in only some libs, not global + # This is a pointless "helpful warning" to use /arch:AVX which we don't want. + CFLAGS="$CFLAGS -wd4752" + CXXFLAGS="$CXXFLAGS -wd4752" + # https://connect.microsoft.com/VisualStudio/feedback/details/888527/warnings-on-dbghelp-h # for dbghelp.h, imagehlp.h, and shobj.h # C4091: 'typedef ': ignored on left of '' when no variable is declared @@ -760,7 +761,7 @@ case "$host" in HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ;; - + *) HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}" @@ -1196,6 +1197,14 @@ case "$target" in fi ;; +i*86-*-solaris*) + MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/7/lib" + ;; + +x86_64-*-solaris*) + MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/7/lib/amd64" + ;; + esac AC_SUBST_LIST(MMX_FLAGS) @@ -2044,7 +2053,11 @@ MOZ_ARG_WITH_BOOL(system-nss, _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.36.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + AC_MSG_ERROR([Building with system NSS is currently not supported.]) +fi + +if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.41, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi if test -z "$MOZ_SYSTEM_NSS"; then @@ -2204,7 +2217,6 @@ MOZ_VORBIS= MOZ_TREMOR= MOZ_SAMPLE_TYPE_FLOAT32= MOZ_SAMPLE_TYPE_S16= -MOZ_DIRECTSHOW= MOZ_WEBRTC= MOZ_PEERCONNECTION= MOZ_SRTP= @@ -2212,8 +2224,6 @@ MOZ_WEBRTC_SIGNALING= MOZ_WEBRTC_ASSERT_ALWAYS=1 MOZ_WEBRTC_HARDWARE_AEC_NS= MOZ_SCTP= -MOZ_ANDROID_OMX= -MOZ_OMX_PLUGIN= MOZ_VPX_ERROR_CONCEALMENT= VPX_USE_YASM= VPX_ASFLAGS= @@ -2222,6 +2232,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 +2244,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= @@ -2240,14 +2252,13 @@ MOZ_INSTALL_TRACKING= ACCESSIBILITY=1 MOZ_TIME_MANAGER= MOZ_AUDIO_CHANNEL_MANAGER= -MOZ_BINARY_EXTENSIONS= MOZ_JETPACK=1 MOZ_DEVTOOLS_SERVER=1 MOZ_DEVTOOLS= MOZ_PLACES=1 MOZ_SERVICES_HEALTHREPORT=1 MOZ_SERVICES_SYNC=1 -MOZ_SERVICES_CLOUDSYNC=1 +MOZ_USERINFO=1 case "$target_os" in mingw*) @@ -2892,23 +2903,6 @@ fi fi # COMPILE_ENVIRONMENT dnl ======================================================== -dnl = DirectShow support -dnl ======================================================== -if test "$OS_ARCH" = "WINNT"; then - dnl Enable DirectShow support by default. - MOZ_DIRECTSHOW=1 -fi - -MOZ_ARG_DISABLE_BOOL(directshow, -[ --disable-directshow Disable support for DirectShow], - MOZ_DIRECTSHOW=, - MOZ_DIRECTSHOW=1) - -if test -n "$MOZ_DIRECTSHOW"; then - AC_DEFINE(MOZ_DIRECTSHOW) -fi; - -dnl ======================================================== dnl = EME support dnl ======================================================== @@ -2939,45 +2933,6 @@ if test -n "$MOZ_EME"; then fi dnl ======================================================== -dnl = Enable media plugin support -dnl ======================================================== -if test "$OS_TARGET" = "Android"; then - dnl Enable support on android by default - MOZ_ANDROID_OMX=1 -fi - -MOZ_ARG_ENABLE_BOOL(android-omx, -[ --enable-android-omx Enable support for Android OMX media backend], - MOZ_ANDROID_OMX=1, - MOZ_ANDROID_OMX=) - -if test -n "$MOZ_ANDROID_OMX"; then - AC_DEFINE(MOZ_ANDROID_OMX) -fi - -dnl ======================================================== -dnl = Enable building OMX media plugin (B2G or Android) -dnl ======================================================== -if test "$OS_TARGET" = "Android"; then - dnl Enable support on android by default - MOZ_OMX_PLUGIN=1 -fi - -MOZ_ARG_ENABLE_BOOL(omx-plugin, -[ --enable-omx-plugin Enable building OMX plugin (B2G)], - MOZ_OMX_PLUGIN=1, - MOZ_OMX_PLUGIN=) - -if test -n "$MOZ_OMX_PLUGIN"; then - if test "$OS_TARGET" = "Android"; then - dnl Only allow building OMX plugin on Android - AC_DEFINE(MOZ_OMX_PLUGIN) - else - dnl fail if we're not building on Android - AC_MSG_ERROR([OMX media plugin can only be built on Android]) - fi -fi - dnl system libvpx Support dnl ======================================================== MOZ_ARG_WITH_BOOL(system-libvpx, @@ -3191,6 +3146,23 @@ fi AC_SUBST(MOZ_PULSEAUDIO) dnl ======================================================== +dnl = Enable sndio +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(sndio, +[ --enable-sndio Enable sndio support], + MOZ_SNDIO=1, + MOZ_SNDIO= ) + +if test -n "$MOZ_SNDIO"; then + AC_DEFINE(MOZ_SNDIO) + MOZ_CHECK_HEADER([sndio.h], [], + AC_MSG_ERROR( + [--enable-sndio specified but it requires sndio development headers])) + AC_DEFINE(MOZ_SNDIO) +fi +AC_SUBST(MOZ_SNDIO) + +dnl ======================================================== dnl NegotiateAuth dnl ======================================================== @@ -3345,13 +3317,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 @@ -3542,11 +3513,15 @@ dnl = FFmpeg's ffvpx configuration dnl ======================================================== MOZ_FFVPX= -case "$CPU_ARCH" in - x86) + +dnl Build ffvpx on 32-bit Windows and all supported 64-bit platforms. +dnl 32-bit *nix has performance issues due to not supporting assembly decoder. + +case "$OS_ARCH:$CPU_ARCH" in + WINNT:x86) MOZ_FFVPX=1 ;; - x86_64) + *:x86_64) MOZ_FFVPX=1 ;; esac @@ -3618,23 +3593,6 @@ AC_CHECK_PROGS(WGET, wget, "") AC_SUBST(WGET) dnl ======================================================== -dnl Maintenance Service -dnl ======================================================== - -MOZ_ARG_ENABLE_BOOL(maintenance-service, -[ --enable-maintenance-service Enable building of maintenanceservice], - MOZ_MAINTENANCE_SERVICE=1, - MOZ_MAINTENANCE_SERVICE= ) - -if test -n "$MOZ_MAINTENANCE_SERVICE"; then - if test "$OS_ARCH" = "WINNT"; then - AC_DEFINE(MOZ_MAINTENANCE_SERVICE) - else - AC_MSG_ERROR([Can only build with --enable-maintenance-service with a Windows target]) - fi -fi - -dnl ======================================================== dnl Bundled fonts on desktop platforms dnl ======================================================== @@ -3690,10 +3648,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) @@ -4209,7 +4167,7 @@ if test -f "${srcdir}/${MOZ_BUILD_APP}/configure.in" ; then _subconfigure_config_args="$ac_configure_args" } tmpscript=`$PYTHON -c 'import os, tempfile; print tempfile.mktemp(prefix="subscript.").replace(os.sep, "/")'` || exit 1 - m4 "${srcdir}/build/autoconf/subconfigure.m4" \ + ${TOOLCHAIN_PREFIX}m4 "${srcdir}/build/autoconf/subconfigure.m4" \ "${srcdir}/build/autoconf/altoptions.m4" \ "${srcdir}/${MOZ_BUILD_APP}/configure.in" > $tmpscript . $tmpscript @@ -4584,6 +4542,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, @@ -4980,27 +4952,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 @@ -5060,12 +5034,6 @@ if test -n "$MOZ_SERVICES_SYNC"; then AC_DEFINE(MOZ_SERVICES_SYNC) fi -dnl Build Services/CloudSync if required -AC_SUBST(MOZ_SERVICES_CLOUDSYNC) -if test -n "$MOZ_SERVICES_CLOUDSYNC"; then - AC_DEFINE(MOZ_SERVICES_CLOUDSYNC) -fi - dnl ======================================================== if test "$MOZ_DEBUG"; then @@ -5107,7 +5075,6 @@ AC_SUBST(MOZ_UNIVERSALCHARDET) AC_SUBST(ACCESSIBILITY) AC_SUBST(MOZ_SPELLCHECK) AC_SUBST(MOZ_ANDROID_ANR_REPORTER) -AC_SUBST(MOZ_MAINTENANCE_SERVICE) AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE) AC_SUBST(MOZ_ENABLE_SIGNMAR) AC_SUBST(MOZ_UPDATER) @@ -5135,10 +5102,6 @@ AC_SUBST(MOZ_FIX_LINK_PATHS) AC_SUBST(MOZ_POST_PROGRAM_COMMAND) AC_SUBST(MOZ_LINKER_EXTRACT) -if test -n "$MOZ_BINARY_EXTENSIONS"; then - AC_DEFINE(MOZ_BINARY_EXTENSIONS) -fi - AC_SUBST(MOZ_ADDON_SIGNING) if test "$MOZ_ADDON_SIGNING" = 1; then AC_DEFINE(MOZ_ADDON_SIGNING) @@ -5161,13 +5124,13 @@ MOZ_ARG_WITH_STRING(macbundlename-prefix, Prefix for MOZ_MACBUNDLE_NAME], [ MOZ_MACBUNDLE_NAME_PREFIX="$withval"]) -MOZ_MACBUNDLE_NAME=`echo $MOZ_APP_DISPLAYNAME | tr -d ' '` +MOZ_MACBUNDLE_NAME=$MOZ_APP_DISPLAYNAME if test "$MOZ_MACBUNDLE_NAME_PREFIX"; then - MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX}${MOZ_MACBUNDLE_NAME}" + MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX} ${MOZ_MACBUNDLE_NAME}" fi if test "$MOZ_DEBUG"; then - MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}Debug.app + MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME}Debug.app" else MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}.app fi @@ -5467,9 +5430,6 @@ AC_SUBST(MOZ_TREMOR) AC_SUBST(MOZ_FFVPX) AC_SUBST_LIST(FFVPX_ASFLAGS) AC_SUBST(MOZ_EME) -AC_SUBST(MOZ_DIRECTSHOW) -AC_SUBST(MOZ_ANDROID_OMX) -AC_SUBST(MOZ_OMX_PLUGIN) AC_SUBST(MOZ_VPX_ERROR_CONCEALMENT) AC_SUBST(VPX_USE_YASM) AC_SUBST_LIST(VPX_ASFLAGS) @@ -5548,10 +5508,6 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE_GTK" ; then AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION) fi -if test -n "$MOZ_DEV_EDITION"; then - AC_DEFINE(MOZ_DEV_EDITION) -fi - if test "$MOZ_DEBUG"; then A11Y_LOG=1 fi @@ -5639,22 +5595,6 @@ fi AC_SUBST(PREPROCESS_OPTION) -dnl ======================================================== -dnl mask as shorthand property -dnl ======================================================== - -# The control structure code will be removed as soon as the feature is stable -# Refer to bug 1281101 for more details. - -# Enable mask-as-shorthand property by default for nightly and aurora channels -if test -z "$RELEASE_OR_BETA"; then - dnl mask as shorthand property enabled - MOZ_ENABLE_MASK_AS_SHORTHAND=1 - AC_DEFINE(MOZ_ENABLE_MASK_AS_SHORTHAND) -fi - -AC_SUBST(MOZ_ENABLE_MASK_AS_SHORTHAND) - # Avoid using obsolete NSPR features AC_DEFINE(NO_NSPR_10_SUPPORT) |