Bug 340795 Building with --with-embedding-profile=minimal failed

patch by romaxa@gmail.com r=bsmedberg

configure.in

@@ -4346,7 +4346,9 @@ xulrunner)
   MOZ_ENABLE_LIBXUL=1
   MOZ_APP_VERSION=$MOZILLA_VERSION
   MOZ_JAVAXPCOM=1
-  MOZ_PLACES=1
+  if test "$MOZ_STORAGE"; then
+    MOZ_PLACES=1
+  fi
   MOZ_EXTENSIONS_DEFAULT=" xml-rpc gnomevfs"
   MOZ_NO_XPCOM_OBSOLETE=1
   AC_DEFINE(MOZ_XULRUNNER)

toolkit/library/Makefile.in

@@ -181,6 +181,10 @@ ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS)
 endif
 
+ifdef MOZ_ENABLE_XFT
+EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+endif
+
 ifdef MOZ_ENABLE_XPRINT
 EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS)
 endif

toolkit/library/libxul-config.mk

@@ -100,10 +100,8 @@ COMPONENT_LIBS += \
 	rdf \
 	htmlpars \
 	imglib2 \
-	gkplugin \
 	gklayout \
 	xmlextras \
-	websrvcs \
 	docshell \
 	embedcomponents \
 	webbrwsr \
@@ -111,18 +109,50 @@ COMPONENT_LIBS += \
 	nsappshell \
 	txmgr \
 	chrome \
-	mozfind \
-	appcomps \
 	windowds \
 	intlapp \
 	commandlines \
 	toolkitcomps \
-	xpinstall \
-	jsd \
 	pipboot \
 	pipnss \
+	$(NULL)
+
+ifdef MOZ_PLUGINS
+COMPONENT_LIBS += \
+	gkplugin \
+	$(NULL)
+endif
+
+ifdef MOZ_XPFE_COMPONENTS
+COMPONENT_LIBS += \
+	mozfind \
+	appcomps \
+	$(NULL)
+endif
+
+ifdef MOZ_XPINSTALL
+COMPONENT_LIBS += \
+	xpinstall \
+	$(NULL)
+endif
+
+ifdef MOZ_JSDEBUGGER
+COMPONENT_LIBS += \
+	jsd \
+	$(NULL)
+endif
+
+ifdef MOZ_PREF_EXTENSIONS
+COMPONENT_LIBS += \
 	autoconfig \
 	$(NULL)
+endif
+
+ifdef MOZ_WEBSERVICES
+COMPONENT_LIBS += \
+	websrvcs \
+	$(NULL)
+endif
 
 ifdef MOZ_AUTH_EXTENSION
 COMPONENT_LIBS += auth
@@ -154,11 +184,13 @@ ifdef MOZ_PLACES
 COMPONENT_LIBS += storagecomps
 STATIC_LIBS += morkreader_s
 else
+ifdef MOZ_MORK
 COMPONENT_LIBS += \
 	mork \
 	tkhstory \
 	$(NULL)
 endif
+endif
 
 ifdef MOZ_XUL
 COMPONENT_LIBS += \
@@ -197,8 +229,10 @@ endif
 
 ifdef MOZ_ENABLE_GTK2
 COMPONENT_LIBS += widget_gtk2
+ifdef MOZ_PREF_EXTENSIONS
 COMPONENT_LIBS += system-pref
 endif
+endif
 
 ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2))
 STATIC_LIBS += gtkxtbin

toolkit/library/nsStaticXULComponents.cpp

@@ -174,10 +174,51 @@
 #endif
 
 #ifdef MOZ_ENABLE_GTK2
-#define SYSTEMPREF_MODULES MODULE(system-pref)
+#ifdef MOZ_PREF_EXTENSIONS
+#define SYSTEMPREF_MODULES MODULE(system-pref) \
+	MODULE(nsAutoConfigModule)
 #else
 #define SYSTEMPREF_MODULES
 #endif
+#else
+#define SYSTEMPREF_MODULES
+#endif
+
+#ifdef MOZ_PLUGINS
+#define PLUGINS_MODULES \
+    MODULE(nsPluginModule)
+#else
+#define PLUGINS_MODULES
+#endif
+
+#ifdef MOZ_WEBSERVICES
+#define WEBSERVICES_MODULES \
+    MODULE(nsWebServicesModule)
+#else
+#define WEBSERVICES_MODULES
+#endif
+
+#ifdef MOZ_XPFE_COMPONENTS
+#define APPLICATION_MODULES \
+    MODULE(application) \
+    MODULE(nsFindComponent)
+#else
+#define APPLICATION_MODULES
+#endif
+
+#ifdef MOZ_UPDATER
+#define UPDATER_MODULES \
+    MODULE(nsSoftwareUpdate)
+#else
+#define UPDATER_MODULES
+#endif
+
+#ifdef MOZ_JSDEBUGGER
+#define JSDEBUGGER_MODULES \
+    MODULE(JavaScript_Debugger)
+#else
+#define JSDEBUGGER_MODULES
+#endif
 
 #ifdef MOZ_FILEVIEW
 #define FILEVIEW_MODULE MODULE(nsFileViewModule)
@@ -189,9 +230,13 @@
 #define PLACES_MODULES \
     MODULE(mozStorageModule)
 #else
+#ifdef MOZ_MORK
 #define PLACES_MODULES \
     MODULE(nsMorkModule)                     \
     MODULE(nsToolkitHistory)
+#else
+#define PLACES_MODULES
+#endif
 #endif    
 
 #ifdef MOZ_XUL
@@ -224,10 +269,10 @@
     WIDGET_MODULES                           \
     MODULE(nsImageLib2Module)                \
     ICON_MODULE                              \
-    MODULE(nsPluginModule)                   \
+    PLUGINS_MODULES                          \
     MODULE(nsLayoutModule)                   \
     MODULE(nsXMLExtrasModule)                \
-    MODULE(nsWebServicesModule)              \
+    WEBSERVICES_MODULES                      \
     MODULE(docshell_provider)                \
     MODULE(embedcomponents)                  \
     MODULE(Browser_Embedding_Module)         \
@@ -238,8 +283,7 @@
     MODULE(nsTransactionManagerModule)       \
     COMPOSER_MODULE                          \
     MODULE(nsChromeModule)                   \
-    MODULE(nsFindComponent)                  \
-    MODULE(application)                      \
+    APPLICATION_MODULES                      \
     MODULE(nsWindowDataSourceModule)         \
     MODULE(nsXPIntlModule)                   \
     MODULE(Apprunner)                        \
@@ -249,11 +293,10 @@
     XULENABLED_MODULES                       \
     MODULE(nsToolkitCompsModule)             \
     XREMOTE_MODULES                          \
-    MODULE(nsSoftwareUpdate)                 \
-    MODULE(JavaScript_Debugger)              \
+    UPDATER_MODULES			     \
+    JSDEBUGGER_MODULES                       \
     MODULE(BOOT)                             \
     MODULE(NSS)                              \
-    MODULE(nsAutoConfigModule)               \
     SYSTEMPREF_MODULES                       \
     /* end of list */
 

xpfe/browser/src/nsBrowserInstance.cpp

@@ -83,7 +83,9 @@
 
 #include "nsIAppStartup.h"
 
+#ifdef MOZ_XPFE_COMPONENTS
 #include "nsIBrowserHistory.h"
+#endif
 #include "nsDocShellCID.h"
 
 #include "nsIObserverService.h"