Bug 393146. Make libxul builds work with --disable-xmlextras. r=luser,a=bz

toolkit/library/libxul-config.mk

@@ -114,7 +114,6 @@ COMPONENT_LIBS += \
 	htmlpars \
 	imglib2 \
 	gklayout \
-	xmlextras \
 	docshell \
 	embedcomponents \
 	webbrwsr \
@@ -127,6 +126,12 @@ COMPONENT_LIBS += \
 	pipnss \
 	$(NULL)
 
+ifdef MOZ_XMLEXTRAS
+COMPONENT_LIBS += \
+	xmlextras \
+	$(NULL)
+endif
+  
 ifdef MOZ_PLUGINS
 DEFINES += -DMOZ_PLUGINS
 COMPONENT_LIBS += \

toolkit/library/nsStaticXULComponents.cpp

@@ -250,6 +250,12 @@
 #define SPELLCHECK_MODULE
 #endif
 
+#ifdef MOZ_XMLEXTRAS
+#define XMLEXTRAS_MODULE MODULE(nsXMLExtrasModule)
+#else
+#define XMLEXTRAS_MODULE
+#endif
+
 #define XUL_MODULES                          \
     MODULE(xpconnect)                        \
     MATHML_MODULES                           \
@@ -273,7 +279,6 @@
     ICON_MODULE                              \
     PLUGINS_MODULES                          \
     MODULE(nsLayoutModule)                   \
-    MODULE(nsXMLExtrasModule)                \
     WEBSERVICES_MODULES                      \
     MODULE(docshell_provider)                \
     MODULE(embedcomponents)                  \
@@ -299,6 +304,7 @@
     MODULE(NSS)                              \
     SYSTEMPREF_MODULES                       \
     SPELLCHECK_MODULE                        \
+    XMLEXTRAS_MODULE                         \
     LAYOUT_DEBUG_MODULE                      \
     /* end of list */