diff options
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 131 |
1 files changed, 55 insertions, 76 deletions
diff --git a/old-configure.in b/old-configure.in index 9eb213988..6e2d743d6 100644 --- a/old-configure.in +++ b/old-configure.in @@ -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.19.3 +SQLITE_VERSION=3.21.0 dnl Set various checks dnl ======================================================== @@ -2259,7 +2259,7 @@ MOZ_ARG_HEADER(Application) ENABLE_SYSTEM_EXTENSION_DIRS=1 MOZ_BRANDING_DIRECTORY= MOZ_OFFICIAL_BRANDING= -MC_OFFICIAL=1 +MC_OFFICIAL= MOZ_FEEDS=1 MOZ_AUTH_EXTENSION=1 if test "$MOZ_IOS"; then @@ -2271,7 +2271,7 @@ MOZ_TREMOR= MOZ_SAMPLE_TYPE_FLOAT32= MOZ_SAMPLE_TYPE_S16= MOZ_DIRECTSHOW= -MOZ_WEBRTC=1 +MOZ_WEBRTC= MOZ_PEERCONNECTION= MOZ_SRTP= MOZ_WEBRTC_SIGNALING= @@ -2312,6 +2312,11 @@ MOZ_BINARY_EXTENSIONS= MOZ_JETPACK=1 MOZ_DEVTOOLS_SERVER=1 MOZ_DEVTOOLS= +MOZ_PLACES=1 +MOZ_SOCIAL=1 +MOZ_SERVICES_HEALTHREPORT=1 +MOZ_SERVICES_SYNC=1 +MOZ_SERVICES_CLOUDSYNC=1 case "$target_os" in mingw*) @@ -2347,10 +2352,10 @@ AC_SUBST(MOZ_ANDROID_DISTRIBUTION_DIRECTORY) dnl ======================================================== dnl = Vendor override dnl ======================================================== -MOZ_ARG_DISABLE_BOOL(official-vendor, -[ --disable-official-vendor Disable the use of official vendor.], - MC_OFFICIAL=, - MC_OFFICIAL=1) +MOZ_ARG_ENABLE_BOOL(official-vendor, +[ --enable-official-vendor This is an official release build.], + MC_OFFICIAL=1, + MC_OFFICIAL=) dnl ======================================================== @@ -2358,11 +2363,10 @@ dnl = Trademarked Branding dnl ======================================================== MOZ_ARG_ENABLE_BOOL(official-branding, [ --enable-official-branding - Enable Official mozilla.org Branding + Enable Official Branding Do not distribute builds with --enable-official-branding unless you have - permission to use trademarks per - http://www.mozilla.org/foundation/trademarks/ .], + permission to use our trademarks!], MOZ_OFFICIAL_BRANDING=1, MOZ_OFFICIAL_BRANDING=) @@ -2582,6 +2586,7 @@ if test -n "$MOZ_OFFICIAL_BRANDING"; then else MOZ_BRANDING_DIRECTORY=${MOZ_OFFICIAL_BRANDING_DIRECTORY} AC_DEFINE(MOZ_OFFICIAL_BRANDING) +dnl Using official branding implies an official release build. MC_OFFICIAL=1 fi fi @@ -3482,68 +3487,6 @@ AC_SUBST(MOZ_GAMEPAD) AC_SUBST(MOZ_GAMEPAD_BACKEND) dnl ======================================================== -dnl = Breakpad crash reporting (on by default on supported platforms) -dnl ======================================================== - -case $target in -i?86-*-mingw*|x86_64-*-mingw*) - MOZ_CRASHREPORTER=1 - ;; -i?86-apple-darwin*|x86_64-apple-darwin*) - if test -z "$MOZ_IOS"; then - MOZ_CRASHREPORTER=1 - fi - ;; -i?86-*-linux*|x86_64-*-linux*|arm-*-linux*) - if test "$MOZ_ENABLE_GTK"; then - MOZ_CRASHREPORTER=1 - fi - ;; -*-android*|*-linuxandroid*) - MOZ_CRASHREPORTER=1 - ;; -esac - -MOZ_ARG_DISABLE_BOOL(crashreporter, -[ --disable-crashreporter Disable breakpad crash reporting], - [MOZ_CRASHREPORTER=], - [MOZ_CRASHREPORTER=F # Force enable breakpad]) - -if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "Darwin"; then - if test "$MOZ_CRASHREPORTER" = F; then - AC_MSG_ERROR([Cannot --enable-crashreporter, as breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH.]) - fi - MOZ_CRASHREPORTER= -fi - -if test -n "$MOZ_CRASHREPORTER"; then - AC_DEFINE(MOZ_CRASHREPORTER) - - if test "$OS_TARGET" = "Linux" && \ - test -z "$SKIP_LIBRARY_CHECKS"; then - PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0) - fi - - if test "$OS_ARCH" = "WINNT"; then - if test -z "$HAVE_64BIT_BUILD" -a -n "$COMPILE_ENVIRONMENT"; then - MOZ_CRASHREPORTER_INJECTOR=1 - AC_DEFINE(MOZ_CRASHREPORTER_INJECTOR) - fi - fi -fi - -MOZ_ARG_WITH_STRING(crashreporter-enable-percent, -[ --with-crashreporter-enable-percent=NN - Enable sending crash reports by default on NN% of users. (default=100)], -[ val=`echo $withval | sed 's/[^0-9]//g'` - MOZ_CRASHREPORTER_ENABLE_PERCENT="$val"]) - -if test -z "$MOZ_CRASHREPORTER_ENABLE_PERCENT"; then - MOZ_CRASHREPORTER_ENABLE_PERCENT=100 -fi -AC_DEFINE_UNQUOTED(MOZ_CRASHREPORTER_ENABLE_PERCENT, $MOZ_CRASHREPORTER_ENABLE_PERCENT) - -dnl ======================================================== dnl = libjpeg-turbo configuration dnl ======================================================== MOZ_LIBJPEG_TURBO= @@ -5254,6 +5197,43 @@ if test "$ENABLE_MARIONETTE"; then fi dnl ======================================================== +dnl = +dnl = Miscellaneous (former toolkit/moz.configure) +dnl = +dnl ======================================================== + +dnl Build Places if required +AC_SUBST(MOZ_PLACES) +if test "$MOZ_PLACES"; then + AC_DEFINE(MOZ_PLACES) +fi + +dnl Build SocialAPI if required +AC_SUBST(MOZ_SOCIAL) +if test "$MOZ_SOCIAL"; then + AC_DEFINE(MOZ_SOCIAL) +fi + +dnl Build Firefox Health Reporter Service +AC_SUBST(MOZ_SERVICES_HEALTHREPORT) +if test -n "$MOZ_SERVICES_HEALTHREPORT"; then + AC_DEFINE(MOZ_SERVICES_HEALTHREPORT) +fi + +dnl Build Sync Services if required +AC_SUBST(MOZ_SERVICES_SYNC) +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" -o "$MOZ_DMD"; then MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS= fi @@ -5291,8 +5271,6 @@ AC_SUBST(MOZ_UNIVERSALCHARDET) AC_SUBST(ACCESSIBILITY) AC_SUBST(MOZ_SPELLCHECK) AC_SUBST(MOZ_ANDROID_ANR_REPORTER) -AC_SUBST(MOZ_CRASHREPORTER) -AC_SUBST(MOZ_CRASHREPORTER_INJECTOR) AC_SUBST(MOZ_MAINTENANCE_SERVICE) AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE) AC_SUBST(MOZ_ENABLE_SIGNMAR) @@ -5503,7 +5481,7 @@ AC_SUBST(MOZ_SIMPLE_PACKAGE_NAME) AC_SUBST(MOZILLA_OFFICIAL) if test "$MOZILLA_OFFICIAL"; then AC_DEFINE(MOZILLA_OFFICIAL) - # Build revisions should always be present in official builds + # Build revisions should always be present in official Mozilla builds MOZ_INCLUDE_SOURCE_INFO=1 fi @@ -5525,7 +5503,7 @@ fi dnl If we have any service that uploads data (and requires data submission dnl policy alert), set MOZ_DATA_REPORTING. dnl We need SUBST for build system and DEFINE for xul preprocessor. -if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then +if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT"; then MOZ_DATA_REPORTING=1 AC_DEFINE(MOZ_DATA_REPORTING) AC_SUBST(MOZ_DATA_REPORTING) @@ -5778,6 +5756,7 @@ 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 MOZ_SYSTEM_NSS=$MOZ_SYSTEM_NSS |