From 7ea35a8a7513ea525995e13b62b0052c464376df Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Fri, 18 Sep 2009 19:59:52 -0700
Subject: [PATCH] Bug 515578 - Kill some more xmlextras and webservices
 leftovers, r=ted

---
 toolkit/library/libxul-config.mk          | 13 -------------
 toolkit/library/nsStaticXULComponents.cpp | 15 ---------------
 toolkit/toolkit-tiers.mk                  |  8 --------
 3 files changed, 36 deletions(-)

diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
index c604ef467c0..d37bbbb6f41 100644
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -130,12 +130,6 @@ COMPONENT_LIBS += \
 	pipnss \
 	$(NULL)
 
-ifdef MOZ_XMLEXTRAS
-COMPONENT_LIBS += \
-	xmlextras \
-	$(NULL)
-endif
-  
 ifdef MOZ_PLUGINS
 DEFINES += -DMOZ_PLUGINS
 COMPONENT_LIBS += \
@@ -200,13 +194,6 @@ COMPONENT_LIBS += \
 	$(NULL)
 endif
 
-ifdef MOZ_WEBSERVICES
-DEFINES += -DMOZ_WEBSERVICES
-COMPONENT_LIBS += \
-	websrvcs \
-	$(NULL)
-endif
-
 ifdef MOZ_AUTH_EXTENSION
 COMPONENT_LIBS += auth
 DEFINES += -DMOZ_AUTH_EXTENSION
diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp
index 13dbab7e4b4..359d3f4a66e 100644
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -148,13 +148,6 @@
 #define PLUGINS_MODULES
 #endif
 
-#ifdef MOZ_WEBSERVICES
-#define WEBSERVICES_MODULES \
-    MODULE(nsWebServicesModule)
-#else
-#define WEBSERVICES_MODULES
-#endif
-
 #ifdef MOZ_XPFE_COMPONENTS
 #ifdef MOZ_RDF
 #define RDFAPP_MODULES \
@@ -230,12 +223,6 @@
 #define SPELLCHECK_MODULE
 #endif
 
-#ifdef MOZ_XMLEXTRAS
-#define XMLEXTRAS_MODULE MODULE(nsXMLExtrasModule)
-#else
-#define XMLEXTRAS_MODULE
-#endif
-
 #ifdef MOZ_XUL
 #ifdef MOZ_ENABLE_GTK2
 #define UNIXPROXY_MODULE MODULE(nsUnixProxyModule)
@@ -283,7 +270,6 @@
     ICON_MODULE                              \
     PLUGINS_MODULES                          \
     MODULE(nsLayoutModule)                   \
-    WEBSERVICES_MODULES                      \
     MODULE(docshell_provider)                \
     MODULE(embedcomponents)                  \
     MODULE(Browser_Embedding_Module)         \
@@ -307,7 +293,6 @@
     MODULE(NSS)                              \
     SYSTEMPREF_MODULES                       \
     SPELLCHECK_MODULE                        \
-    XMLEXTRAS_MODULE                         \
     LAYOUT_DEBUG_MODULE                      \
     UNIXPROXY_MODULE                         \
     OSXPROXY_MODULE                          \
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
index 0f90dbf2ba8..ced141a41fb 100644
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -148,14 +148,6 @@ tier_gecko_dirs	+= \
 		xpfe/appshell \
 		$(NULL)
 
-ifdef MOZ_XMLEXTRAS
-tier_gecko_dirs += extensions/xmlextras
-endif
-
-ifdef MOZ_WEBSERVICES
-tier_gecko_dirs += extensions/webservices
-endif
-
 ifdef MOZ_UNIVERSALCHARDET
 tier_gecko_dirs += extensions/universalchardet
 endif