diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-05 12:41:16 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-05 12:41:16 +0100 |
| commit | 2d652d1c355c8bdde03a6c278b5b7b444424e394 (patch) | |
| tree | 0ea18eabc7d3cdec78e59701e10e15a662af6641 /old-configure.in | |
| parent | 2782832f265a8e0a7923ca885b431907cde7cc49 (diff) | |
| parent | e8417003899a4ec9274815be30352c1328fc32e9 (diff) | |
| download | UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.gz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.lz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.xz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.zip | |
Merge branch 'master' into ported-upstream
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) |