Bug 1338934 - Exclude autoconfig files from installer if not compiled. r=aceman
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 18 Feb 2017 07:00:00 +0100
changeset 27659 afa0caf4012c5beb229866dfee8af236d2f0dfd4
parent 27658 1d004608b57f98aab13e93a31b874879210302a7
child 27660 aa0e3b9c8e18982724f0754fe25ca5ee86a217c4
push idunknown
push userunknown
push dateunknown
reviewersaceman
bugs1338934
Bug 1338934 - Exclude autoconfig files from installer if not compiled. r=aceman
mail/installer/Makefile.in
mail/installer/package-manifest.in
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -107,16 +107,20 @@ endif
 ifdef MOZ_BUNDLED_FONTS
 DEFINES += -DMOZ_BUNDLED_FONTS=1
 endif
 
 ifdef MAKENSISU
 DEFINES += -DHAVE_MAKENSISU=1
 endif
 
+ifdef MOZ_PREF_EXTENSIONS
+DEFINES += -DMOZ_PREF_EXTENSIONS=1
+endif
+
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@)
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -354,17 +354,20 @@
 ; download progress for jsdownloads
 @RESPATH@/components/DownloadsStartup.js
 
 ; Protocol/Content handling
 @RESPATH@/components/nsSMTPProtocolHandler.js
 @RESPATH@/components/nsSMTPProtocolHandler.manifest
 
 ; misson control, autoconfig
+#ifdef MOZ_PREF_EXTENSIONS
 @RESPATH@/defaults/autoconfig/prefcalls.js
+@RESPATH@/components/autoconfig.xpt
+#endif
 
 ; Address Book autocomplete
 @RESPATH@/components/nsAbAutoCompleteMyDomain.js
 @RESPATH@/components/nsAbAutoCompleteSearch.js
 
 ; Windows Search integration
 ; the module is included as part of the "Modules" rule
 #ifdef XP_WIN32
@@ -386,17 +389,16 @@
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
 #endif
 @RESPATH@/components/accessibility.xpt
 #endif
 @RESPATH@/components/appshell.xpt
 @RESPATH@/components/appstartup.xpt
 @RESPATH@/components/autocomplete.xpt
-@RESPATH@/components/autoconfig.xpt
 @RESPATH@/components/browser-element.xpt
 ; caps (JavaScript security)
 @RESPATH@/components/caps.xpt
 @RESPATH@/components/chrome.xpt
 @RESPATH@/components/commandhandler.xpt
 @RESPATH@/components/commandlines.xpt
 @RESPATH@/components/commuconv.xpt
 @RESPATH@/components/composer.xpt