Standalone Composer build was failing because of recent changes to GlobalHistory; b=235394,r=bsmedberg,a=bzbarsky

toolkit/components/Makefile.in

@@ -45,6 +45,9 @@ include $(DEPTH)/config/autoconf.mk
 ifdef MOZ_THUNDERBIRD
 DIRS = console filepicker printing viewsource
 else
+ifdef MOZ_STANDALONE_COMPOSER
+DIRS = console filepicker printing viewsource
+else
 DIRS = 		\
 	autocomplete \
 	console \
@@ -66,6 +69,7 @@ endif
 DIRS += downloads build
 
 endif
+endif
 
 
 include $(topsrcdir)/config/rules.mk

toolkit/content/xul.css

@@ -656,8 +656,15 @@ textbox[type="timed"] {
 
 /********** autocomplete textbox **********/
 
-/* thunderbird doesn't use the new toolkit's autocomplete widget yet.... */
+/* thunderbird and Nvu don't use the new toolkit's autocomplete widget yet.... */
+
 #ifdef MOZ_THUNDERBIRD
+#define AUTOCOMPLETE_OLD_STYLE
+#elifdef MOZ_STANDALONE_COMPOSER
+#define AUTOCOMPLETE_OLD_STYLE
+#endif
+
+#ifdef AUTOCOMPLETE_OLD_STYLE
 
 textbox[type="autocomplete"] {
   -moz-binding: url("chrome://global/content/autocomplete.xml#autocomplete");

xpfe/components/Makefile.in

@@ -26,7 +26,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef MOZ_THUNDERBIRD
+ifdef MOZ_THUNDERBIRD
+MOZ_STANDALONE_NONBROWSER_XULAPP=1
+endif
+ifdef MOZ_STANDALONE_COMPOSER
+define MOZ_STANDALONE_NONBROWSER_XULAPP
+1
+endef
+endif
+
+ifndef MOZ_STANDALONE_NONBROWSER_XULAPP
 DIRS	= \
 			directory \
 			filepicker \
@@ -88,15 +97,11 @@ ifdef MOZ_ENABLE_XREMOTE
 DIRS		+= xremote
 endif
 
-ifndef MOZ_THUNDERBIRD
-ifndef MOZ_STANDALONE_COMPOSER
+ifndef MOZ_STANDALONE_NONBROWSER_XULAPP
 DIRS		+= build
 else
 DIRS		+= build2
 endif
-else
-DIRS	        += build2
-endif
 
 include $(topsrcdir)/config/rules.mk