From 03590a6711d601ef3ddb48787e9f3f556705b5db Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 5 Nov 2019 18:27:14 -0500
Subject: Issue #1258 - Part 8: Ifdef MailNews OAuth2 Support

Use --disable-mailnews-oauth2 to exclude it. Confvars won't be respected.
---
 mailnews/base/src/moz.build        | 7 +++++--
 mailnews/base/src/msgBase.manifest | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'mailnews/base/src')

diff --git a/mailnews/base/src/moz.build b/mailnews/base/src/moz.build
index b84839e9ec..55dbab1546 100644
--- a/mailnews/base/src/moz.build
+++ b/mailnews/base/src/moz.build
@@ -68,12 +68,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 EXTRA_COMPONENTS += [
     'folderLookupService.js',
     'msgAsyncPrompter.js',
-    'msgBase.manifest',
-    'msgOAuth2Module.js',
     'newMailNotificationService.js',
     'nsMailNewsCommandLineHandler.js',
 ]
 
+if CONFIG['MOZ_MAILNEWS_OAUTH2']:
+    EXTRA_COMPONENTS += ['msgOAuth2Module.js']
+
+EXTRA_PP_COMPONENTS += ['msgBase.manifest']
+
 EXTRA_JS_MODULES += [
     'virtualFolderWrapper.js',
 ]
diff --git a/mailnews/base/src/msgBase.manifest b/mailnews/base/src/msgBase.manifest
index e7af18bdf9..1753939b8d 100644
--- a/mailnews/base/src/msgBase.manifest
+++ b/mailnews/base/src/msgBase.manifest
@@ -8,5 +8,7 @@ contract @mozilla.org/newMailNotificationService;1 {740880E6-E299-4165-B82F-DF1D
 category profile-after-change NewMailNotificationService @mozilla.org/newMailNotificationService;1 
 component {a30be08c-afc8-4fed-9af7-79778a23db23} folderLookupService.js
 contract @mozilla.org/mail/folder-lookup;1 {a30be08c-afc8-4fed-9af7-79778a23db23}
+#ifdef MOZ_MAILNEWS_OAUTH2
 component {b63d8e4c-bf60-439b-be0e-7c9f67291042} msgOAuth2Module.js
 contract @mozilla.org/mail/oauth2-module;1 {b63d8e4c-bf60-439b-be0e-7c9f67291042}
+#endif
\ No newline at end of file
-- 
cgit v1.2.3