diff options
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/old-configure.in b/old-configure.in index 3cb499b93..a67e65ce7 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2425,10 +2425,6 @@ 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 @@ -2441,7 +2437,6 @@ fi AC_SUBST(MOZ_XULRUNNER) AC_SUBST(MOZ_B2G) -AC_SUBST(MOZ_MULET) AC_SUBST(MOZ_B2G_VERSION) dnl ======================================================== @@ -2624,6 +2619,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, @@ -5771,7 +5782,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 @@ -5791,7 +5803,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) |