diff options
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 329 |
1 files changed, 72 insertions, 257 deletions
diff --git a/old-configure.in b/old-configure.in index dabd37e6d..1670a90b6 100644 --- a/old-configure.in +++ b/old-configure.in @@ -94,66 +94,15 @@ if test "$COMPILE_ENVIRONMENT"; then MOZ_ANDROID_NDK fi # COMPILE_ENVIRONMENT -if test -n "$gonkdir"; then - dnl export for js/src/configure. We can't pass the option down normally, - dnl because it's a `--enable-project=b2g`-only option. - export gonkdir - kernel_name=`uname -s | tr "[[:upper:]]" "[[:lower:]]"` - android_source="$gonkdir" - ANDROID_SOURCE="$android_source" - - case "$android_version" in - 15) - CPPFLAGS="-I$gonkdir/frameworks/base/opengl/include -I$gonkdir/frameworks/base/native/include -I$gonkdir/frameworks/base/include -I$gonkdir/frameworks/base/services/camera -I$gonkdir/frameworks/base/include/media/ -I$gonkdir/frameworks/base/include/media/stagefright -I$gonkdir/frameworks/base/include/media/stagefright/openmax -I$gonkdir/frameworks/base/media/libstagefright/rtsp -I$gonkdir/frameworks/base/media/libstagefright/include -I$gonkdir/external/dbus -I$gonkdir/dalvik/libnativehelper/include/nativehelper $CPPFLAGS" - MOZ_SECUREELEMENT=1 - ;; - 17|18) - CPPFLAGS="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include $CPPFLAGS" - MOZ_SECUREELEMENT=1 - ;; - 19) - CPPFLAGS="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include $CPPFLAGS" - MOZ_AUDIO_OFFLOAD=1 - MOZ_SECUREELEMENT=1 - AC_SUBST(MOZ_AUDIO_OFFLOAD) - AC_DEFINE(MOZ_AUDIO_OFFLOAD) - ;; - 21|22) - CPPFLAGS="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include $CPPFLAGS" - MOZ_AUDIO_OFFLOAD=1 - AC_SUBST(MOZ_AUDIO_OFFLOAD) - AC_DEFINE(MOZ_AUDIO_OFFLOAD) - ;; - *) - AC_MSG_ERROR([Unsupported platform version: $android_version]) - ;; - esac - - CPPFLAGS="-I$gonkdir/system -I$gonkdir/system/core/include -I$gonkdir/hardware/libhardware/include -I$gonkdir/external/valgrind/fxos-include $CPPFLAGS" - LDFLAGS="-L$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib -Wl,-rpath-link=$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib $LDFLAGS" - +case "$target" in +*-android*|*-linuxandroid*) + ZLIB_DIR=yes AC_DEFINE(ANDROID) - AC_DEFINE_UNQUOTED(ANDROID_VERSION, $android_version) - AC_DEFINE(HAVE_SYS_UIO_H) - AC_DEFINE(HAVE_PTHREADS) - - dnl ANDROID_VERSION is only required for the AC_SUBST below - ANDROID_VERSION=$android_version - AC_SUBST(ANDROID_VERSION) - - direct_nspr_config=1 - -else - case "$target" in - *-android*|*-linuxandroid*) - ZLIB_DIR=yes - AC_DEFINE(ANDROID) - ;; - *-linux*) - AC_PATH_PROG(OBJCOPY,objcopy) - ;; - esac -fi + ;; +*-linux*) + AC_PATH_PROG(OBJCOPY,objcopy) + ;; +esac case "$target" in *-apple-darwin*) @@ -563,7 +512,7 @@ dnl ============================================================== if test "$COMPILE_ENVIRONMENT"; then MOZ_ARCH_OPTS else - if test "$OS_TARGET" = Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then + if test "$OS_TARGET" = "Android"; then dnl Default Android builds to ARMv7. MOZ_ARCH=armv7-a fi @@ -926,13 +875,8 @@ case "$target" in *-android*|*-linuxandroid*) AC_DEFINE(NO_PW_GECOS) - if test -n "$gonkdir"; then - _PLATFORM_HAVE_RIL=1 - MOZ_SYNTH_PICO=1 - else - if test "$COMPILE_ENVIRONMENT"; then - MOZ_LINKER=1 - fi + if test "$COMPILE_ENVIRONMENT"; then + MOZ_LINKER=1 fi MOZ_GFX_OPTIMIZE_MOBILE=1 @@ -1030,12 +974,14 @@ case "$target" in dnl VS2012+ defaults to -arch:SSE2. We want to target nothing dnl more recent, so set that explicitly here unless another dnl target arch has already been set. + changequote(,) if test -z `echo $CFLAGS | grep -i [-/]arch:`; then CFLAGS="$CFLAGS -arch:SSE2" fi if test -z `echo $CXXFLAGS | grep -i [-/]arch:`; then CXXFLAGS="$CXXFLAGS -arch:SSE2" fi + changequote([,]) SSE_FLAGS="-arch:SSE" SSE2_FLAGS="-arch:SSE2" dnl MSVC allows the use of intrinsics without any flags @@ -2256,6 +2202,7 @@ dnl ======================================================== MOZ_ARG_HEADER(Application) +ENABLE_TESTS= ENABLE_SYSTEM_EXTENSION_DIRS=1 MOZ_BRANDING_DIRECTORY= MOZ_OFFICIAL_BRANDING= @@ -2305,9 +2252,6 @@ MOZ_INSTALL_TRACKING= ACCESSIBILITY=1 MOZ_TIME_MANAGER= MOZ_AUDIO_CHANNEL_MANAGER= -MOZ_CONTENT_SANDBOX= -MOZ_GMP_SANDBOX= -MOZ_SANDBOX= MOZ_BINARY_EXTENSIONS= MOZ_JETPACK=1 MOZ_DEVTOOLS_SERVER=1 @@ -2411,30 +2355,21 @@ if test -n "$WITH_APP_BASENAME" ; then MOZ_APP_BASENAME="$WITH_APP_BASENAME" fi -if test -n "$MOZ_B2G"; then - AC_DEFINE(MOZ_B2G) -fi - # Graphene is a desktop runtime for running applications with a HTML UI. if test -n "$MOZ_GRAPHENE"; then AC_DEFINE(MOZ_GRAPHENE) fi -AC_SUBST(MOZ_B2G) -AC_SUBST(MOZ_B2G_VERSION) - dnl ======================================================== dnl Ensure Android SDK and build-tools versions depending on dnl mobile target. dnl ======================================================== -if test -z "$gonkdir" ; then - case "$MOZ_BUILD_APP" in - mobile/android) - MOZ_ANDROID_SDK(23, 23.0.3 23.0.1) - ;; - esac -fi +case "$MOZ_BUILD_APP" in +mobile/android) + MOZ_ANDROID_SDK(23, 23.0.3 23.0.1) + ;; +esac dnl ======================================================== dnl = @@ -2927,7 +2862,7 @@ AC_SUBST(MOZ_SCTP) AC_SUBST(MOZ_SRTP) AC_SUBST_LIST(MOZ_WEBRTC_X11_LIBS) -dnl Use integers over floats for audio on B2G and Android +dnl Use integers over floats for audio on Android dnl (regarless of the CPU architecture, because audio dnl backends for those platforms don't support floats. We also dnl use integers on ARM with other OS, because it's more efficient. @@ -2987,18 +2922,6 @@ if test -n "$MOZ_DIRECTSHOW"; then fi; dnl ======================================================== -dnl = Built-in fragmented MP4 support. -dnl ======================================================== - -if test x"$MOZ_WIDGET_TOOLKIT" = x"gonk" -a -n "$MOZ_FMP4" -a -n "$android_version"; then - # we now know for sure that $android_version is not an empty string! - if test "$android_version" -ge "18"; then - MOZ_GONK_MEDIACODEC=1 - AC_SUBST(MOZ_GONK_MEDIACODEC) - fi -fi - -dnl ======================================================== dnl = EME support dnl ======================================================== @@ -3031,7 +2954,7 @@ fi dnl ======================================================== dnl = Enable media plugin support dnl ======================================================== -if test "$OS_TARGET" = Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then +if test "$OS_TARGET" = "Android"; then dnl Enable support on android by default MOZ_ANDROID_OMX=1 fi @@ -3048,7 +2971,7 @@ fi dnl ======================================================== dnl = Enable building OMX media plugin (B2G or Android) dnl ======================================================== -if test "$OS_TARGET" = Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then +if test "$OS_TARGET" = "Android"; then dnl Enable support on android by default MOZ_OMX_PLUGIN=1 fi @@ -3060,11 +2983,11 @@ MOZ_ARG_ENABLE_BOOL(omx-plugin, if test -n "$MOZ_OMX_PLUGIN"; then if test "$OS_TARGET" = "Android"; then - dnl Only allow building OMX plugin on Gonk (B2G) or Android + dnl Only allow building OMX plugin on Android AC_DEFINE(MOZ_OMX_PLUGIN) else - dnl fail if we're not building on Gonk or Android - AC_MSG_ERROR([OMX media plugin can only be built on B2G or Android]) + dnl fail if we're not building on Android + AC_MSG_ERROR([OMX media plugin can only be built on Android]) fi fi @@ -3273,13 +3196,9 @@ MOZ_ARG_DISABLE_BOOL(pulseaudio, if test -n "$MOZ_PULSEAUDIO"; then AC_DEFINE(MOZ_PULSEAUDIO) - if test -z "$gonkdir"; then - PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , - [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" - AC_MSG_ERROR([Building pulseaudio audio backend requires libpulse development package])]) - else - MOZ_PULSEAUDIO_CFLAGS="-I$gonkdir/external/pulseaudio/pulseaudio/src" - fi + PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , + [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" + AC_MSG_ERROR([Building pulseaudio audio backend requires libpulse development package])]) fi AC_SUBST(MOZ_PULSEAUDIO) @@ -3794,6 +3713,32 @@ if test -n "$MOZ_UPDATER"; then fi dnl ======================================================== +dnl Build the tests? +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(tests, +[ --enable-tests Build test libraries & programs], + ENABLE_TESTS=1, + ENABLE_TESTS= ) + +if test -n "$ENABLE_TESTS"; then + GTEST_HAS_RTTI=0 + AC_DEFINE(ENABLE_TESTS) + AC_DEFINE_UNQUOTED(GTEST_HAS_RTTI, 0) + AC_SUBST(GTEST_HAS_RTTI) + if test -n "$_WIN32_MSVC"; then + AC_DEFINE_UNQUOTED(_VARIADIC_MAX, 10) + fi + if test "${OS_TARGET}" = "Android"; then + AC_DEFINE(GTEST_OS_LINUX_ANDROID) + AC_DEFINE(GTEST_USE_OWN_TR1_TUPLE) + AC_DEFINE_UNQUOTED(GTEST_HAS_CLONE, 0) + AC_SUBST(GTEST_OS_LINUX_ANDROID) + AC_SUBST(GTEST_USE_OWN_TR1_TUPLE) + AC_SUBST(GTEST_HAS_CLONE) + fi +fi + +dnl ======================================================== dnl parental controls (for Windows Vista) dnl ======================================================== MOZ_ARG_DISABLE_BOOL(parental-controls, @@ -3816,99 +3761,6 @@ fi AC_SUBST(MOZ_NO_SMART_CARDS) dnl ======================================================== -dnl = Sandboxing support -dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(sandbox, -[ --enable-sandbox Enable sandboxing support], - MOZ_SANDBOX=1, - MOZ_SANDBOX=) - -if test -n "$MOZ_TSAN" -o -n "$MOZ_ASAN"; then - # Bug 1182565: TSan conflicts with sandboxing on Linux. - # Bug 1287971: LSan also conflicts with sandboxing on Linux. - case $OS_TARGET in - Linux|Android) - MOZ_SANDBOX= - ;; - esac -fi - -dnl ======================================================== -dnl = Content process sandboxing -dnl ======================================================== -if test -n "$gonkdir"; then - MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX -fi - -case "$OS_TARGET:$NIGHTLY_BUILD" in -WINNT:*) - MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX - ;; -Darwin:*) - MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX - ;; -Linux:1) - case $CPU_ARCH in - x86_64|x86) - MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX - ;; - esac - ;; -esac - -MOZ_ARG_ENABLE_BOOL(content-sandbox, -[ --enable-content-sandbox Enable sandboxing support for content-processes - --disable-content-sandbox Disable sandboxing support for content-processes], - MOZ_CONTENT_SANDBOX=1, - MOZ_CONTENT_SANDBOX=) - -if test -n "$MOZ_CONTENT_SANDBOX" -a -z "$MOZ_SANDBOX"; then - AC_MSG_ERROR([--enable-content-sandbox and --disable-sandbox are conflicting options]) -fi - -if test -n "$MOZ_CONTENT_SANDBOX"; then - AC_DEFINE(MOZ_CONTENT_SANDBOX) -fi - -AC_SUBST(MOZ_CONTENT_SANDBOX) - -dnl ======================================================== -dnl = Gecko Media Plugin sandboxing -dnl ======================================================== -case $OS_TARGET in -WINNT) - MOZ_GMP_SANDBOX=$MOZ_SANDBOX - ;; -Linux) - case $CPU_ARCH in - x86_64|x86) - MOZ_GMP_SANDBOX=$MOZ_SANDBOX - ;; - esac - ;; -Darwin) - MOZ_GMP_SANDBOX=$MOZ_SANDBOX - ;; -esac - -if test -n "$MOZ_GMP_SANDBOX"; then - AC_DEFINE(MOZ_GMP_SANDBOX) -fi - -AC_SUBST(MOZ_GMP_SANDBOX) - -if test -z "$MOZ_CONTENT_SANDBOX" -a -z "$MOZ_GMP_SANDBOX"; then - MOZ_SANDBOX= -fi - -if test -n "$MOZ_SANDBOX"; then - AC_DEFINE(MOZ_SANDBOX) -fi - -AC_SUBST(MOZ_SANDBOX) - - -dnl ======================================================== dnl = dnl = Module specific options dnl = @@ -4262,8 +4114,6 @@ Android|WINNT|Darwin) esac if test -n "$MOZ_REPLACE_MALLOC"; then - MOZ_SYSTEM_JEMALLOC= - dnl Replace-malloc Mac linkage quirks if test -n "$MACOSX_DEPLOYMENT_TARGET"; then AC_CACHE_CHECK([how to do weak dynamic linking], @@ -4330,15 +4180,6 @@ if test -z "$MOZ_MEMORY"; then ;; esac else - if test -n "$MOZ_JEMALLOC4" -a -z "$MOZ_REPLACE_MALLOC"; then - MOZ_SYSTEM_JEMALLOC=1 - AC_CHECK_FUNCS(mallctl nallocx,, - [MOZ_SYSTEM_JEMALLOC= - break]) - if test -n "$MOZ_SYSTEM_JEMALLOC"; then - AC_DEFINE(MOZ_SYSTEM_JEMALLOC) - fi - fi if test "x$MOZ_DEBUG" = "x1"; then AC_DEFINE(MOZ_MEMORY_DEBUG) fi @@ -4351,7 +4192,6 @@ else ;; esac fi # MOZ_MEMORY -AC_SUBST(MOZ_SYSTEM_JEMALLOC) AC_SUBST(MOZ_GLUE_IN_PROGRAM) # Allow the application to provide a subconfigure script. @@ -4545,10 +4385,6 @@ MOZ_ARG_DISABLE_BOOL(startupcache, MOZ_DISABLE_STARTUPCACHE=1, MOZ_DISABLE_STARTUPCACHE=) -dnl bug 988880: disable startup cache on b2g -if test -n "$MOZ_B2G"; then - MOZ_DISABLE_STARTUPCACHE=1 -fi if test -n "$MOZ_DISABLE_STARTUPCACHE"; then AC_DEFINE(MOZ_DISABLE_STARTUPCACHE) fi @@ -4557,28 +4393,26 @@ AC_SUBST(MOZ_DISABLE_STARTUPCACHE) dnl ========================================= dnl = Enable packaging Gaia with B2G desktop dnl ========================================= -if test x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then - if test -n "$GAIADIR" -a ! -d "$GAIADIR" ; then - AC_MSG_ERROR([GAIADIR '$GAIADIR' isn't a valid directory]) - fi +if test -n "$GAIADIR" -a ! -d "$GAIADIR" ; then + AC_MSG_ERROR([GAIADIR '$GAIADIR' isn't a valid directory]) +fi - AC_SUBST(GAIADIR) - if test -n "$GAIADIR" ; then - AC_DEFINE(PACKAGE_GAIA) - fi +AC_SUBST(GAIADIR) +if test -n "$GAIADIR" ; then + AC_DEFINE(PACKAGE_GAIA) +fi - if test -n "$FXOS_SIMULATOR" -a -z "$GAIADIR" ; then - AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined]) - fi +if test -n "$FXOS_SIMULATOR" -a -z "$GAIADIR" ; then + AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined]) +fi - if test -n "$FXOS_SIMULATOR" ; then - AC_DEFINE(FXOS_SIMULATOR) - AC_SUBST(FXOS_SIMULATOR) - fi +if test -n "$FXOS_SIMULATOR" ; then + AC_DEFINE(FXOS_SIMULATOR) + AC_SUBST(FXOS_SIMULATOR) fi dnl ======================================================== -dnl = Enable Pico Speech Synthesis (Gonk usually) +dnl = Enable Pico Speech Synthesis dnl ======================================================== MOZ_ARG_ENABLE_BOOL(synth-pico, [ --enable-synth-pico Set compile flags necessary for compiling Pico Web Speech API ], @@ -5092,7 +4926,7 @@ else fi case "$MOZ_WIDGET_TOOLKIT" in -android|gonk) +android) TK_CFLAGS="$MOZ_CAIRO_CFLAGS $MOZ_PIXMAN_CFLAGS" TK_LIBS="$MOZ_CAIRO_LIBS $MOZ_PIXMAN_LIBS" ;; @@ -5129,9 +4963,6 @@ dnl case "$OS_TARGET" in Android) - if test -n "$gonkdir"; then - NECKO_WIFI=1 - fi ;; Darwin) if test -z "$MOZ_IOS"; then @@ -5178,7 +5009,7 @@ fi dnl dnl Always build Marionette if not Android or B2G dnl -if test "$OS_TARGET" != Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then +if test "$OS_TARGET" != "Android"; then AC_DEFINE(ENABLE_MARIONETTE) fi AC_SUBST(ENABLE_MARIONETTE) @@ -5257,6 +5088,8 @@ AC_SUBST(LIBICONV) AC_SUBST(MOZ_TOOLKIT_SEARCH) AC_SUBST(MOZ_FEEDS) +AC_SUBST(ENABLE_TESTS) + AC_SUBST(MOZ_UNIVERSALCHARDET) AC_SUBST(ACCESSIBILITY) AC_SUBST(MOZ_SPELLCHECK) @@ -5432,10 +5265,6 @@ else MOZ_APP_MAXVERSION=$MOZ_APP_VERSION fi -MOZ_B2G_VERSION=${MOZ_B2G_VERSION:-"1.0.0"} -AC_DEFINE_UNQUOTED(MOZ_B2G_VERSION,"$MOZ_B2G_VERSION") -AC_DEFINE_UNQUOTED(MOZ_B2G_OS_NAME,"$MOZ_B2G_OS_NAME") - AC_SUBST(MOZ_APP_NAME) AC_SUBST(MOZ_APP_REMOTINGNAME) AC_SUBST(MOZ_APP_DISPLAYNAME) @@ -5507,15 +5336,6 @@ dnl ======================================================== dnl ICU Support dnl ======================================================== -# Internationalization is not built or exposed on Fennec. -# See Bug 1215256 - -if test "$MOZ_BUILD_APP" = "mobile/android"; then - _INTL_API=no -else - _INTL_API=yes -fi - if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then USE_ICU=1 fi @@ -5745,7 +5565,6 @@ MOZ_OFFICIAL_BRANDING=$MOZ_OFFICIAL_BRANDING MOZ_BRANDING_DIRECTORY=$MOZ_BRANDING_DIRECTORY MC_BASILISK=$MC_BASILISK MC_PALEMOON=$MC_PALEMOON -MOZ_SANDBOX=$MOZ_SANDBOX MOZ_EME=$MOZ_EME MOZ_WEBRTC=$MOZ_WEBRTC MOZ_SYSTEM_LIBEVENT=$MOZ_SYSTEM_LIBEVENT @@ -5832,10 +5651,6 @@ AC_SUBST(NSS_DISABLE_LIBPKIX) MOZ_CREATE_CONFIG_STATUS() -if test "$COMPILE_ENVIRONMENT"; then - MOZ_SUBCONFIGURE_JEMALLOC() -fi - # Run freetype configure script if test "$MOZ_TREE_FREETYPE"; then |