diff options
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/old-configure.in b/old-configure.in index 580b0a669..5942b0139 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2261,6 +2261,7 @@ MOZ_ARG_HEADER(Application) ENABLE_SYSTEM_EXTENSION_DIRS=1 MOZ_BRANDING_DIRECTORY= MOZ_OFFICIAL_BRANDING= +MC_OFFICIAL=1 MOZ_FEEDS=1 MOZ_AUTH_EXTENSION=1 if test "$MOZ_IOS"; then @@ -2344,6 +2345,15 @@ fi 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) + + +dnl ======================================================== dnl = Trademarked Branding dnl ======================================================== MOZ_ARG_ENABLE_BOOL(official-branding, @@ -2401,10 +2411,6 @@ fi # that haven't made a confvars.sh yet. Don't add new stuff here, use # MOZ_BUILD_APP. case "$MOZ_BUILD_APP" in -browser) - AC_DEFINE(MOZ_PHOENIX) - ;; - xulrunner) AC_DEFINE(MOZ_XULRUNNER) ;; @@ -2433,7 +2439,6 @@ if test -n "$MOZ_RUST"; then fi fi -AC_SUBST(MOZ_PHOENIX) AC_SUBST(MOZ_XULRUNNER) AC_SUBST(MOZ_B2G) AC_SUBST(MOZ_MULET) @@ -2592,9 +2597,15 @@ if test -n "$MOZ_OFFICIAL_BRANDING"; then else MOZ_BRANDING_DIRECTORY=${MOZ_OFFICIAL_BRANDING_DIRECTORY} AC_DEFINE(MOZ_OFFICIAL_BRANDING) + MC_OFFICIAL=1 fi fi +AC_SUBST(MC_OFFICIAL) +if test -n "$MC_OFFICIAL"; then + AC_DEFINE(MC_OFFICIAL) +fi + MOZ_ARG_WITH_STRING(branding, [ --with-branding=dir Use branding from the specified directory.], MOZ_BRANDING_DIRECTORY=$withval) |