Bug 1500747 - Allow overriding extension building defaults in SeaMonkey via mozconfig. r=ewong

suite/app.mozbuild

@@ -10,6 +10,12 @@ include('/toolkit/toolkit.mozbuild')
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
+if CONFIG['MOZ_IRC']:
+    DIRS += ['/extensions/irc']
+
+if CONFIG['MOZ_DOMINSPECTOR']:
+    DIRS += ['/extensions/inspector']
+
 DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
 
 if CONFIG['MOZ_CALENDAR']:

suite/configure.in

@@ -7,9 +7,6 @@ dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
 dnl Things we need to carry from confvars.sh
 AC_SUBST(SEAMONKEY_VERSION)
 AC_SUBST(MOZ_BUNDLED_FONTS)
-AC_SUBST(MOZ_IRC)
-AC_SUBST(MOZ_DOMINSPECTOR)
-AC_SUBST(MOZ_DEBUGQA)
 
 dnl More things we need to carry from confvars.sh
 AC_SUBST(moztopsrcdir)

suite/confvars.sh

@@ -48,18 +48,3 @@ fi
 # Include the DevTools client, not just the server (which is the default)
 MOZ_DEVTOOLS=all
 
-# Bundled extensions ChatZilla DOM Inspector and debugQA
-MOZ_IRC=
-MOZ_DOMINSPECTOR=
-
-if [[ $MOZ_APP_VERSION == *a* ]]; then
-  MOZ_DEBUGQA=
-fi
-
-if [[ $MOZ_IRC == 1 ]]; then
-  MOZ_EXTENSIONS_DEFAULT='irc'
-fi
-
-if [[ $MOZ_DOMINSPECTOR == 1 ]]; then
-  MOZ_EXTENSIONS_DEFAULT+=' inspector'
-fi

suite/moz.configure

@@ -26,6 +26,45 @@ def toolkit_configure(is_comm):
     else:
         return '../mozilla/toolkit/moz.configure'
 
+# Building extensions is disabled by default.
+# Bug 1231349 needs to be fixed first for l10n builds.
+# Set desired defaults to True from False when the l10n bug is fixed.
+
+# =========================================================
+# = 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('../mailnews/moz.configure')
 include(toolkit_configure)