From 2eef10791129874f6e04b446fbdbaa3b4ad61a60 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Mon, 5 Feb 2018 05:48:29 -0500
Subject: Official Vendor and Pale Moon special case

---
 old-configure.in | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'old-configure.in')

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
@@ -2343,6 +2344,15 @@ if test -n "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY"; then
 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 ========================================================
@@ -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)
-- 
cgit v1.2.3