diff options
author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-27 15:57:18 +0200 |
---|---|---|
committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-27 15:57:18 +0200 |
commit | d990d8ab2cade6c928e8bbe56ae038d020cef599 (patch) | |
tree | c7561ae0f303cb0d4a7a7507178531b4852e4dea /old-configure.in | |
parent | 0c36b27511c1fbca594f0426c493ef601fda3e4c (diff) | |
parent | 8d5ec757ece850fb7ad5c712868f305636e41177 (diff) | |
download | UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.gz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.lz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.xz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.zip |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_array_values_1
Diffstat (limited to 'old-configure.in')
-rw-r--r-- | old-configure.in | 107 |
1 files changed, 75 insertions, 32 deletions
diff --git a/old-configure.in b/old-configure.in index 92a5f729e..9eb213988 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2109,7 +2109,7 @@ MOZ_ARG_WITH_BOOL(system-nss, _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.28.6, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + AM_PATH_NSS(3.35, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi if test -n "$MOZ_SYSTEM_NSS"; then @@ -2425,23 +2425,8 @@ if test -n "$MOZ_GRAPHENE"; then AC_DEFINE(MOZ_GRAPHENE) fi -if test -n "$MOZ_MULET"; then - AC_DEFINE(MOZ_MULET) -fi - -# Propagate feature switches for code written in rust from confvars.sh -if test -n "$MOZ_RUST"; then - if test -n "$MOZ_RUST_MP4PARSE"; then - AC_DEFINE(MOZ_RUST_MP4PARSE) - fi - if test -n "$MOZ_RUST_URLPARSE"; then - AC_DEFINE(MOZ_RUST_URLPARSE) - fi -fi - AC_SUBST(MOZ_XULRUNNER) AC_SUBST(MOZ_B2G) -AC_SUBST(MOZ_MULET) AC_SUBST(MOZ_B2G_VERSION) dnl ======================================================== @@ -2624,6 +2609,22 @@ fi AC_SUBST(MOZ_BRANDING_DIRECTORY) dnl ======================================================== +dnl = Private Build +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(private-build, +[ --enable-private-build Enable private builds + This allows you to build with official + branding for personal use only using any + build time configuration.], + MC_PRIVATE_BUILD=1, + MC_PRIVATE_BUILD=) + +AC_SUBST(MC_PRIVATE_BUILD) +if test -n "$MC_PRIVATE_BUILD"; then + AC_DEFINE(MC_PRIVATE_BUILD) +fi + +dnl ======================================================== dnl = Distribution ID dnl ======================================================== MOZ_ARG_WITH_STRING(distribution-id, @@ -2878,12 +2879,12 @@ x86_64 | arm | aarch64 | x86 | ppc* | ia64) esac dnl ======================================================== -dnl = Disable WebRTC code +dnl = Enable WebRTC code dnl ======================================================== -MOZ_ARG_DISABLE_BOOL(webrtc, -[ --disable-webrtc Disable support for WebRTC], - MOZ_WEBRTC=, - MOZ_WEBRTC=1) +MOZ_ARG_ENABLE_BOOL(webrtc, +[ --enable-webrtc Enable support for WebRTC], + MOZ_WEBRTC=1, + MOZ_WEBRTC=) if test -n "$MOZ_WEBRTC"; then AC_DEFINE(MOZ_WEBRTC) @@ -3002,6 +3003,35 @@ if test x"$MOZ_WIDGET_TOOLKIT" = x"gonk" -a -n "$MOZ_FMP4" -a -n "$android_versi fi fi +dnl ======================================================== +dnl = EME support +dnl ======================================================== + +MOZ_ARG_ENABLE_STRING(eme, +[ --enable-eme[=widevine] Enable support for Encrypted Media Extensions ], + MOZ_EME_ARGS=$enableval) + +if test "$MOZ_EME_ARGS"; then + if test "$MOZ_EME_ARGS" = "no"; then + dnl EME explicitly disabled with --disable-eme + MOZ_EME= + elif test "$MOZ_EME_ARGS" = "yes"; then + dnl EME explicitly enabled with --enable-eme + MOZ_EME=1 + else + dnl EME explicitly enabled with --enable-eme=<args> + MOZ_EME=1 + MOZ_EME_MODULES=`echo $MOZ_EME_ARGS | sed -e 's/,/ /g'` + fi +fi + +AC_SUBST_SET(MOZ_EME_MODULES) +if test -n "$MOZ_EME"; then + if test -z "$MOZ_FMP4"; then + AC_MSG_ERROR([Encrypted Media Extension support requires Fragmented MP4 support]) + fi + AC_DEFINE(MOZ_EME) +fi dnl ======================================================== dnl = Enable media plugin support @@ -3210,15 +3240,20 @@ dnl ================================== dnl = Check alsa availability on Linux dnl ================================== +dnl If using Linux, enable the alsa library by default +if test "$OS_TARGET" = "Linux"; then + MOZ_ALSA=1 +fi + MOZ_ARG_ENABLE_BOOL(alsa, -[ --enable-alsa Enable Alsa support], +[ --enable-alsa Enable Alsa support (default on Linux)], MOZ_ALSA=1, MOZ_ALSA=) if test -n "$MOZ_ALSA"; then PKG_CHECK_MODULES(MOZ_ALSA, alsa, , [echo "$MOZ_ALSA_PKG_ERRORS" - AC_MSG_ERROR([Need alsa for audio output on Linux. (On Ubuntu, you might try installing the package libasound2-dev.)])]) + AC_MSG_ERROR([You need ALSA for audio output on Linux.])]) fi AC_SUBST(MOZ_ALSA) @@ -3246,7 +3281,7 @@ if test -n "$MOZ_PULSEAUDIO"; then if test -z "$gonkdir"; then PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" - AC_MSG_ERROR([pulseaudio audio backend requires libpulse development package])]) + AC_MSG_ERROR([Building pulseaudio audio backend requires libpulse development package])]) else MOZ_PULSEAUDIO_CFLAGS="-I$gonkdir/external/pulseaudio/pulseaudio/src" fi @@ -4745,12 +4780,12 @@ fi AC_SUBST(MOZ_DEVTOOLS_SERVER) dnl ======================================================== -dnl = Enable Mozilla Developer Tools (client) +dnl = Disable Mozilla Developer Tools (client) dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(devtools, -[ --enable-devtools Enable Mozilla Developer Tools (client)], - MOZ_DEVTOOLS=1, - MOZ_DEVTOOLS=) +MOZ_ARG_DISABLE_BOOL(devtools, +[ --disable-devtools Disable Mozilla Developer Tools (client)], + MOZ_DEVTOOLS=, + MOZ_DEVTOOLS=1) if test -n "$MOZ_DEVTOOLS"; then if test ! -n "$MOZ_DEVTOOLS_SERVER"; then @@ -5459,6 +5494,9 @@ fi AC_SUBST(MOZ_APP_STATIC_INI) +AC_DEFINE_UNQUOTED(MOZ_UA_BUILDID, "$MOZ_UA_BUILDID") +AC_SUBST(MOZ_UA_BUILDID) + AC_SUBST(MOZ_PKG_SPECIAL) AC_SUBST(MOZ_SIMPLE_PACKAGE_NAME) @@ -5627,6 +5665,7 @@ AC_SUBST(MOZ_VORBIS) 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) @@ -5733,7 +5772,8 @@ dnl ======================================================== dnl Directive 4 dnl ======================================================== -DIRECTIVE4_LIST="MOZ_OFFICIAL_BRANDING=$MOZ_OFFICIAL_BRANDING +DIRECTIVE4_LIST=" +MOZ_OFFICIAL_BRANDING=$MOZ_OFFICIAL_BRANDING MOZ_BRANDING_DIRECTORY=$MOZ_BRANDING_DIRECTORY MC_BASILISK=$MC_BASILISK MC_PALEMOON=$MC_PALEMOON @@ -5753,7 +5793,11 @@ MOZ_SYSTEM_JEMALLOC=$MOZ_SYSTEM_JEMALLOC" DIRECTIVE4=`$PYTHON $_topsrcdir/build/directive4.py $DIRECTIVE4_LIST` if test -n "$DIRECTIVE4"; then - AC_ERROR([Branding Violation - Please see: http://www.palemoon.org/redist.shtml]) + if test -n "$MC_PRIVATE_BUILD"; then + AC_MSG_WARN([Private Build - The configuration you have chosen to use with official branding deviates from official build configuration. Your build is thus for personal and private use only and must not be (re)distributed - Please see: http://www.palemoon.org/redist.shtml]) + else + AC_MSG_ERROR([Branding Violation - Please see: http://www.palemoon.org/redist.shtml]) + fi fi AC_SUBST(DIRECTIVE4) @@ -5930,7 +5974,6 @@ export MOZ_ZLIB_CFLAGS export MOZ_ZLIB_LIBS export MOZ_APP_NAME export MOZ_APP_REMOTINGNAME -export RUSTC export MOZILLA_CENTRAL_PATH=$_topsrcdir export STLPORT_CPPFLAGS export STLPORT_LIBS |