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

reverting unnecessary changes to xpfe
replacing updater with xpinstall (bad reference)
defining things in libxul-config.mk per bsmedberg, spotted by jag

toolkit/library/libxul-config.mk

@@ -118,12 +118,14 @@ COMPONENT_LIBS += \
 	$(NULL)
 
 ifdef MOZ_PLUGINS
+DEFINES += -DMOZ_PLUGINS
 COMPONENT_LIBS += \
 	gkplugin \
 	$(NULL)
 endif
 
 ifdef MOZ_XPFE_COMPONENTS
+DEFINES += -DMOZ_XPFE_COMPONENTS
 COMPONENT_LIBS += \
 	mozfind \
 	appcomps \
@@ -131,24 +133,28 @@ COMPONENT_LIBS += \
 endif
 
 ifdef MOZ_XPINSTALL
+DEFINES += -DMOZ_XPINSTALL
 COMPONENT_LIBS += \
 	xpinstall \
 	$(NULL)
 endif
 
 ifdef MOZ_JSDEBUGGER
+DEFINES += -DMOZ_JSDEBUGGER
 COMPONENT_LIBS += \
 	jsd \
 	$(NULL)
 endif
 
 ifdef MOZ_PREF_EXTENSIONS
+DEFINES += -DMOZ_PREF_EXTENSIONS
 COMPONENT_LIBS += \
 	autoconfig \
 	$(NULL)
 endif
 
 ifdef MOZ_WEBSERVICES
+DEFINES += -DMOZ_WEBSERVICES
 COMPONENT_LIBS += \
 	websrvcs \
 	$(NULL)

toolkit/library/nsStaticXULComponents.cpp

@@ -20,7 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- * 	 Christopher Seawood <cls@seawood.org>
+ *   Christopher Seawood <cls@seawood.org>
  *   Chris Waterson <waterson@netscape.com>
  *   Benjamin Smedberg <bsmedberg@covad.net>
  *
@@ -176,7 +176,7 @@
 #ifdef MOZ_ENABLE_GTK2
 #ifdef MOZ_PREF_EXTENSIONS
 #define SYSTEMPREF_MODULES MODULE(system-pref) \
-	MODULE(nsAutoConfigModule)
+    MODULE(nsAutoConfigModule)
 #else
 #define SYSTEMPREF_MODULES
 #endif
@@ -206,11 +206,11 @@
 #define APPLICATION_MODULES
 #endif
 
-#ifdef MOZ_UPDATER
-#define UPDATER_MODULES \
+#ifdef MOZ_XPINSTALL
+#define XPINSTALL_MODULES \
     MODULE(nsSoftwareUpdate)
 #else
-#define UPDATER_MODULES
+#define XPINSTALL_MODULES
 #endif
 
 #ifdef MOZ_JSDEBUGGER
@@ -293,7 +293,7 @@
     XULENABLED_MODULES                       \
     MODULE(nsToolkitCompsModule)             \
     XREMOTE_MODULES                          \
-    UPDATER_MODULES			     \
+    XPINSTALL_MODULES                        \
     JSDEBUGGER_MODULES                       \
     MODULE(BOOT)                             \
     MODULE(NSS)                              \
@@ -313,7 +313,7 @@ XUL_MODULES
  * The nsStaticModuleInfo
  */
 static nsStaticModuleInfo const gStaticModuleInfo[] = {
-	XUL_MODULES
+    XUL_MODULES
 };
 
 nsStaticModuleInfo const *const kPStaticModules = gStaticModuleInfo;

xpfe/browser/src/Makefile.in

@@ -70,10 +70,6 @@ ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER))
 REQUIRES += toolkitcomps history
 endif
 
-ifdef MOZ_XPFE_COMPONENTS
-DEFINES         +=-DMOZ_XPFE_COMPONENTS
-endif
-
 CPPSRCS		= \
 		nsBrowserInstance.cpp \
 		nsBrowserStatusFilter.cpp \

xpfe/browser/src/nsBrowserInstance.cpp

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