Bug 347884 Building XULRunner with --embedding-profile=minimal failed, tkhstory

only build mork+toolkit history ifdef MOZ_XUL
patch by romaxa@gmail.com r=timeless r=bsmedberg

toolkit/library/libxul-config.mk

@@ -195,12 +195,14 @@ COMPONENT_LIBS += \
 	$(NULL)
 else
 ifdef MOZ_MORK
+ifdef MOZ_XUL
 COMPONENT_LIBS += \
 	mork \
 	tkhstory \
 	$(NULL)
 endif
 endif
+endif
 
 ifdef MOZ_XUL
 COMPONENT_LIBS += \

toolkit/library/nsStaticXULComponents.cpp

@@ -231,7 +231,7 @@
     MODULE(mozStorageModule)                 \
     MODULE(nsPlacesModule)
 #else
-#ifdef MOZ_MORK
+#if (defined(MOZ_MORK) && defined(MOZ_XUL))
 #define PLACES_MODULES \
     MODULE(nsMorkModule)                     \
     MODULE(nsToolkitHistory)

xpfe/browser/src/nsBrowserInstance.cpp

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