Bug #379431 --> stop building xpcom obsolete for Thunderbird!

sr=bienvenu git-svn-id: svn://10.0.0.236/trunk@228620 18797224-902f-48f8-a5cc-f745e15eee43
2007-06-23 05:23:34 +00:00
parent e1a2a9942f
commit d5fa9fcfcd
5 changed files with 1 additions and 6 deletions
--- a/mozilla/mail/config/basemail-os2
+++ b/mozilla/mail/config/basemail-os2
@@ -128,7 +128,6 @@ components\xpcom_ds.xpt
 components\xpcom_io.xpt
 components\xpcom_threads.xpt
 components\xpcom_xpti.xpt
-components\xpcom_obsolete.xpt

 ; xpconnect
 components\xpconect.dll
--- a/mozilla/mail/config/basemail-unix
+++ b/mozilla/mail/config/basemail-unix
@@ -139,7 +139,6 @@ components/xpcom_io.xpt
 components/xpcom_threads.xpt
 components/xpcom_xpti.xpt
 components/libxpcom_compat_c.so
-components/xpcom_obsolete.xpt

 ; xpconnect
 components/libxpconnect.so
--- a/mozilla/mail/confvars.sh
+++ b/mozilla/mail/confvars.sh
@@ -57,3 +57,4 @@ MOZ_SAFE_BROWSING=1
 MOZ_SVG=
 MOZ_APP_VERSION=$THUNDERBIRD_VERSION
 MOZ_EXTENSIONS_DEFAULT=" wallet"
+MOZ_NO_XPCOM_OBSOLETE=1
--- a/mozilla/mail/installer/windows/packages-static
+++ b/mozilla/mail/installer/windows/packages-static
@@ -25,7 +25,6 @@ bin\components\xpcom_ds.xpt
 bin\components\xpcom_io.xpt
 bin\components\xpcom_thread.xpt
 bin\components\xpcom_xpti.xpt
-bin\components\xpcom_obsolete.xpt
 bin\nspr4.dll
 bin\plc4.dll
 bin\plds4.dll
--- a/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in
+++ b/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in
@@ -58,7 +58,6 @@ endif
 META_COMPONENT = mail

 REQUIRES	= xpcom \
-                  xpcom_obsolete \
 		  string \
 		  mime \
 		  msgbase \
@@ -100,7 +99,6 @@ EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)
 else

@@ -110,6 +108,5 @@ FORCE_STATIC_LIB = 1
 endif


-
 include $(topsrcdir)/config/rules.mk