From d32c7cd39e9bbbc2bad8d8d5b8f7cde5fb55d83d Mon Sep 17 00:00:00 2001
From: "benjamin%smedbergs.us"
 <benjamin%smedbergs.us@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 29 Mar 2006 23:44:04 +0000
Subject: [PATCH] Bug 332114 - XULRunner shouldn't build xpcomobsolete, r=darin

git-svn-id: svn://10.0.0.236/trunk@193229 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/configure.in                              | 4 +---
 mozilla/toolkit/library/Makefile.in               | 1 -
 mozilla/toolkit/library/libxul-config.mk          | 4 ----
 mozilla/toolkit/library/libxul-rules.mk           | 6 +-----
 mozilla/toolkit/library/nsStaticXULComponents.cpp | 1 -
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/mozilla/configure.in b/mozilla/configure.in
index 74a90757291..b4b09337f58 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -4478,6 +4478,7 @@ xulrunner)
   MOZ_JAVAXPCOM=1
   MOZ_PLACES=1
   MOZ_EXTENSIONS_DEFAULT=" xml-rpc gnomevfs"
+  MOZ_NO_XPCOM_OBSOLETE=1
   AC_DEFINE(MOZ_XULRUNNER)
   ;;
 
@@ -5089,9 +5090,6 @@ MOZ_ARG_DISABLE_BOOL(xpcom-obsolete,
     MOZ_NO_XPCOM_OBSOLETE=)
 
 if test -n "$MOZ_NO_XPCOM_OBSOLETE"; then
-if test -n "$MOZ_XPINSTALL"; then
-    AC_MSG_ERROR([Building without xpcom-obsolete isn't support when building xpinstal.])
-fi
 if test -z "$MOZ_SINGLE_PROFILE"; then
     AC_MSG_ERROR([Building without xpcom-obsolete isn't support when building full profile support.])
 fi
diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in
index ccdee9929e9..890f8b8a574 100644
--- a/mozilla/toolkit/library/Makefile.in
+++ b/mozilla/toolkit/library/Makefile.in
@@ -59,7 +59,6 @@ endif
 REQUIRES = \
 	xpcom \
 	string \
-	xpcom_obsolete \
 	$(ZLIB_REQUIRES) \
 	xulapp \
 	$(NULL)
diff --git a/mozilla/toolkit/library/libxul-config.mk b/mozilla/toolkit/library/libxul-config.mk
index 55ccd9b5626..166934b77fa 100644
--- a/mozilla/toolkit/library/libxul-config.mk
+++ b/mozilla/toolkit/library/libxul-config.mk
@@ -45,7 +45,6 @@ REQUIRES += libreg widget gfx
 
 CPPSRCS += \
 	dlldeps.cpp \
-	dlldeps-obs.cpp \
 	nsGFXDeps.cpp \
 	nsDllMain.cpp \
 	$(NULL)
@@ -69,7 +68,6 @@ REQUIRES += libreg widget gfx
 
 CPPSRCS += \
 	dlldeps.cpp \
-	dlldeps-obs.cpp \
 	nsGFXDeps.cpp \
 	$(NULL)
 
@@ -85,7 +83,6 @@ endif
 STATIC_LIBS += \
 	xpcom_core \
 	mozreg_s \
-	xpcom_compat \
 	unicharutil_s \
 	ucvutil_s \
 	gkgfx \
@@ -94,7 +91,6 @@ STATIC_LIBS += \
 
 # component libraries
 COMPONENT_LIBS += \
-	xpcom_compat_c \
 	xpconnect \
 	necko \
 	auth \
diff --git a/mozilla/toolkit/library/libxul-rules.mk b/mozilla/toolkit/library/libxul-rules.mk
index 956a09eee80..af0d32fee5c 100644
--- a/mozilla/toolkit/library/libxul-rules.mk
+++ b/mozilla/toolkit/library/libxul-rules.mk
@@ -65,7 +65,6 @@ DEFINES += \
 	-D_IMPL_NS_STRINGAPI \
 	-DEXPORT_XPT_API \
 	-DEXPORT_XPTC_API \
-	-D_IMPL_NS_COM_OBSOLETE \
 	-D_IMPL_NS_GFX \
 	-D_IMPL_NS_WIDGET \
 	$(NULL)
@@ -85,10 +84,7 @@ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG))
 EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
 endif
 
-export:: dlldeps.cpp dlldeps-obs.cpp
+export:: dlldeps.cpp
 
 dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp
 	$(INSTALL) $^ .
-
-dlldeps-obs.cpp: $(topsrcdir)/xpcom/obsolete/dlldeps-obs.cpp
-	$(INSTALL) $^ .
diff --git a/mozilla/toolkit/library/nsStaticXULComponents.cpp b/mozilla/toolkit/library/nsStaticXULComponents.cpp
index e5d6d377696..808206dc750 100644
--- a/mozilla/toolkit/library/nsStaticXULComponents.cpp
+++ b/mozilla/toolkit/library/nsStaticXULComponents.cpp
@@ -172,7 +172,6 @@
 #endif
 
 #define XUL_MODULES                          \
-    MODULE(xpcomObsoleteModule)              \
     MODULE(xpconnect)                        \
     MATHML_MODULES                           \
     MODULE(nsUConvModule)                    \