From cb4e29d933552ad05c53c2ebe838ec5b3288b55c Mon Sep 17 00:00:00 2001 From: "roc+@cs.cmu.edu" Date: Thu, 23 Aug 2007 15:52:42 -0700 Subject: [PATCH] Bug 393146. Make libxul builds work with --disable-xmlextras. r=luser,a=bz --- toolkit/library/libxul-config.mk | 7 ++++++- toolkit/library/nsStaticXULComponents.cpp | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk index ee51be726d4..9641cf74ac4 100644 --- a/toolkit/library/libxul-config.mk +++ b/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 += \ diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp index 3ff403fcc02..bf5aa94af89 100644 --- a/toolkit/library/nsStaticXULComponents.cpp +++ b/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 */