diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-05 06:27:57 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-05 06:27:57 -0500 |
| commit | 591ff8e63813bd4af50f4441d5bbc77c79d35dae (patch) | |
| tree | d60872a901ed822bfff9d1b47621af13d4a395cc /old-configure.in | |
| parent | d2b88bf812a9f13ac02e5cd116ae19e34a198ada (diff) | |
| parent | b7852aab25b8ab06e0463bbe7c5d20cdd6f89750 (diff) | |
| download | UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar.gz UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar.lz UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar.xz UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.zip | |
Merge branch 'branding-work'
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/old-configure.in b/old-configure.in index ab15abf69..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, @@ -2587,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) |