diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-13 22:06:20 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-13 22:06:20 +0200 |
| commit | f2bc0785b9852dae1b6f5c700fbca41e573aa916 (patch) | |
| tree | 22b8e069753b338ae8164dc1341f9f51804f1fb1 /old-configure.in | |
| parent | 501db456d4d84a9345374e9b15775f6e10883a41 (diff) | |
| download | UXP-f2bc0785b9852dae1b6f5c700fbca41e573aa916.tar UXP-f2bc0785b9852dae1b6f5c700fbca41e573aa916.tar.gz UXP-f2bc0785b9852dae1b6f5c700fbca41e573aa916.tar.lz UXP-f2bc0785b9852dae1b6f5c700fbca41e573aa916.tar.xz UXP-f2bc0785b9852dae1b6f5c700fbca41e573aa916.zip | |
Convert MOZILLA_OFFICIAL conditionals to MC_OFFICIAL where needed.
- `--enable-official-branding` implies `MC_OFFICIAL` (no need to specifically set it)
- `--enable-official-vendor` can be used to set `MC_OFFICIAL` on builds without `--enable-official-branding` that should still be considered official release versions.
- `MC_OFFICIAL` implies `--enable-release`, meaning `DEVELOPER_OPTIONS` isn't set
- `MC_OFFICIAL` makes `nsXULAppInfo.getIsOfficial` return `true`
- `MC_OFFICIAL` makes `AppConstants.MOZILLA_OFFICIAL` (for compatibility in extensions) and `AppConstants.MC_OFFICIAL` return `true`
- Optional, for the time being: `MOZILLA_OFFICIAL` is still present in some places in case someone wants to build a Mozilla-alike official application and has the rights and necessary keys to use Mozilla-official third-party services. This must always be combined with `MC_OFFICIAL` to have a sane combination of defines. This may be removed in the future.
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/old-configure.in b/old-configure.in index 2a9e2c65f..6e2d743d6 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2259,7 +2259,7 @@ MOZ_ARG_HEADER(Application) ENABLE_SYSTEM_EXTENSION_DIRS=1 MOZ_BRANDING_DIRECTORY= MOZ_OFFICIAL_BRANDING= -MC_OFFICIAL=1 +MC_OFFICIAL= MOZ_FEEDS=1 MOZ_AUTH_EXTENSION=1 if test "$MOZ_IOS"; then @@ -2352,10 +2352,10 @@ 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) +MOZ_ARG_ENABLE_BOOL(official-vendor, +[ --enable-official-vendor This is an official release build.], + MC_OFFICIAL=1, + MC_OFFICIAL=) dnl ======================================================== @@ -2363,11 +2363,10 @@ dnl = Trademarked Branding dnl ======================================================== MOZ_ARG_ENABLE_BOOL(official-branding, [ --enable-official-branding - Enable Official mozilla.org Branding + Enable Official Branding Do not distribute builds with --enable-official-branding unless you have - permission to use trademarks per - http://www.mozilla.org/foundation/trademarks/ .], + permission to use our trademarks!], MOZ_OFFICIAL_BRANDING=1, MOZ_OFFICIAL_BRANDING=) @@ -2587,6 +2586,7 @@ if test -n "$MOZ_OFFICIAL_BRANDING"; then else MOZ_BRANDING_DIRECTORY=${MOZ_OFFICIAL_BRANDING_DIRECTORY} AC_DEFINE(MOZ_OFFICIAL_BRANDING) +dnl Using official branding implies an official release build. MC_OFFICIAL=1 fi fi @@ -5481,7 +5481,7 @@ AC_SUBST(MOZ_SIMPLE_PACKAGE_NAME) AC_SUBST(MOZILLA_OFFICIAL) if test "$MOZILLA_OFFICIAL"; then AC_DEFINE(MOZILLA_OFFICIAL) - # Build revisions should always be present in official builds + # Build revisions should always be present in official Mozilla builds MOZ_INCLUDE_SOURCE_INFO=1 fi |