# HG changeset patch
# User Bill Gianopoulos <wgianopoulos@gmail.com>
# Date 1539812879 14400
#      Wed Oct 17 17:47:59 2018 -0400
# Node ID bd36350d005d7826db90acbb211884485f2e00b6
# Parent  13380345af6431d0669767bfff637b1c31ee1d97
Bug 1500747 - Allow overriding extension building defaults in SeaMonkey via mozconfig. r=ewong a=IanN

diff --git a/suite/app.mozbuild b/suite/app.mozbuild
--- a/suite/app.mozbuild
+++ b/suite/app.mozbuild
@@ -5,16 +5,22 @@
 
 include('/mailnews/mailnews.mozbuild')
 
 include('/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
+if CONFIG['MOZ_IRC']:
+    DIRS += ['/extensions/irc']
+
+if CONFIG['MOZ_DOMINSPECTOR']:
+    DIRS += ['/extensions/inspector']
+
 if CONFIG['MOZ_COMPOSER']:
     DIRS += ['/editor/ui']
 
 DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
 
 if CONFIG['MOZ_CALENDAR']:
     DIRS += [
         '/calendar/lightning',
diff --git a/suite/configure.in b/suite/configure.in
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -6,19 +6,16 @@ dnl file, You can obtain one at http://m
 
 dnl Things we need to carry from confvars.sh
 AC_DEFINE(MOZ_SUITE)
 AC_SUBST(MOZ_SUITE)
 AC_SUBST(MOZ_COMPOSER)
 AC_SUBST(SEAMONKEY_VERSION)
 AC_DEFINE(MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES)
 AC_SUBST(MOZ_BUNDLED_FONTS)
-AC_SUBST(MOZ_IRC)
-AC_SUBST(MOZ_DOMINSPECTOR)
-AC_SUBST(MOZ_DEBUGQA)
 
 dnl Optional parts of the build.
 AC_SUBST(MOZ_MORK)
 if test "$MOZ_MORK"; then
   AC_DEFINE(MOZ_MORK)
 fi
 if test "$OS_ARCH" != "WINNT"; then
   MOZ_MOVEMAIL=1
diff --git a/suite/confvars.sh b/suite/confvars.sh
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -33,25 +33,10 @@ MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDE
 if test "$OS_ARCH" = "WINNT" -o \
         "$OS_ARCH" = "Linux"; then
   MOZ_BUNDLED_FONTS=1
 fi
 
 # Include the DevTools client, not just the server (which is the default)
 MOZ_DEVTOOLS=all
 
-# Bundled extensions Lightning Chatzilla DOM Inspector and debugQA
+# Bundled extensions Lightning
 MOZ_CALENDAR=1
-MOZ_IRC=1
-MOZ_DOMINSPECTOR=1
-
-# frg private patch always build debugQA extension
-MOZ_DEBUGQA=1
-
-if [[ $MOZ_IRC == 1 ]]; then
-  MOZ_EXTENSIONS_DEFAULT='irc'
-fi
-
-if [[ $MOZ_DOMINSPECTOR == 1 ]]; then
-  MOZ_EXTENSIONS_DEFAULT+=' inspector'
-fi
-# Include Lightning
-MOZ_CALENDAR=1
diff --git a/suite/moz.configure b/suite/moz.configure
--- a/suite/moz.configure
+++ b/suite/moz.configure
@@ -3,9 +3,48 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 imply_option('MOZ_PLACES', True)
 imply_option('MOZ_SERVICES_SYNC', False)
 imply_option('MOZ_SOCIAL', False)
 
+# Building extensions is enabled by default.
+# Bug 1231349 needs to be fixed for successful l10n builds.
+
+# =========================================================
+# = ChatZilla extension
+# =========================================================
+option('--enable-irc', default=False,
+       help='Enable building of the ChatZilla IRC extension')
+
+@depends_if('--enable-irc')
+def irc(arg):
+    return True
+
+set_config('MOZ_IRC', irc)
+
+# =========================================================
+# = DOM Inspector extension
+# =========================================================
+option('--enable-dominspector', default=False,
+       help='Enable building of the DOM Inspector extension')
+
+@depends_if('--enable-dominspector')
+def dominspector(arg):
+    return True
+
+set_config('MOZ_DOMINSPECTOR', dominspector)
+
+# =========================================================
+# = DebugQA extension
+# =========================================================
+option('--enable-debugqa', default=False,
+       help='Enable building of the DebugQA extension')
+
+@depends_if('--enable-debugqa')
+def debugqa(arg):
+    return True
+
+set_config('MOZ_DEBUGQA', debugqa)
+
 include('../mozilla/toolkit/moz.configure')