Bug 651845 - Remove --enable/disable-static-mail; r=Callek
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 16 May 2011 08:47:07 +0100
changeset 7780 18fbc091e23ff0227ead3c3f1bc7c3dcddc10c05
parent 7779 e8332e7c3d7c4b04d427699760b2924f97ca1cb2
child 7781 166b7163d9aa4a754f11b24c275bdb3e9ff957ca
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs651845
Bug 651845 - Remove --enable/disable-static-mail; r=Callek
config/autoconf.mk.in
configure.in
mail/confvars.sh
mailnews/Makefile.in
mailnews/addrbook/Makefile.in
mailnews/addrbook/build/Makefile.in
mailnews/addrbook/build/nsAbFactory.cpp
mailnews/base/build/Makefile.in
mailnews/base/build/nsMsgFactory.cpp
mailnews/base/public/msgCore.h
mailnews/base/test/Makefile.in
mailnews/base/util/Makefile.in
mailnews/compose/Makefile.in
mailnews/compose/build/Makefile.in
mailnews/compose/build/nsMsgCompFactory.cpp
mailnews/db/msgdb/Makefile.in
mailnews/db/msgdb/build/Makefile.in
mailnews/db/msgdb/build/nsMsgDBFactory.cpp
mailnews/extensions/bayesian-spam-filter/Makefile.in
mailnews/extensions/bayesian-spam-filter/build/Makefile.in
mailnews/extensions/bayesian-spam-filter/build/nsBayesianFilterFactory.cpp
mailnews/extensions/fts3/Makefile.in
mailnews/extensions/fts3/build/Makefile.in
mailnews/extensions/fts3/build/nsFts3TokenizerFactory.cpp
mailnews/extensions/mailviews/Makefile.in
mailnews/extensions/mailviews/build/Makefile.in
mailnews/extensions/mailviews/build/nsMsgMailViewsFactory.cpp
mailnews/extensions/mdn/Makefile.in
mailnews/extensions/mdn/build/Makefile.in
mailnews/extensions/mdn/build/nsMsgMdnFactory.cpp
mailnews/extensions/smime/build/Makefile.in
mailnews/imap/Makefile.in
mailnews/imap/build/Makefile.in
mailnews/imap/build/nsImapFactory.cpp
mailnews/imap/test/Makefile.in
mailnews/import/build/Makefile.in
mailnews/local/Makefile.in
mailnews/local/build/Makefile.in
mailnews/local/build/nsMsgLocalFactory.cpp
mailnews/mapi/mapihook/src/Makefile.in
mailnews/mime/Makefile.in
mailnews/mime/build/Makefile.in
mailnews/mime/build/nsMimeModule.cpp
mailnews/mime/cthandlers/Makefile.in
mailnews/mime/cthandlers/vcard/Makefile.in
mailnews/mime/cthandlers/vcard/mimect-vcard.def
mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp
mailnews/mime/cthandlers/vcard/vcard.def
mailnews/mime/emitters/Makefile.in
mailnews/mime/emitters/build/Makefile.in
mailnews/mime/emitters/build/nsEmitterFactory.cpp
mailnews/news/Makefile.in
mailnews/news/build/Makefile.in
mailnews/news/build/nsMsgNewsFactory.cpp
suite/confvars.sh
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -517,17 +517,16 @@ ifdef WIN32_CRT_SRC_DIR
 DLLFLAGS = @DLLFLAGS@
 endif
 endif
 
 # Codesighs tools option, enables win32 mapfiles.
 MOZ_MAPINFO	= @MOZ_MAPINFO@
 
 MOZ_THUNDERBIRD = @MOZ_THUNDERBIRD@
-MOZ_STATIC_MAIL_BUILD = @MOZ_STATIC_MAIL_BUILD@
 MOZ_INCOMPLETE_EXTERNAL_LINKAGE = @MOZ_INCOMPLETE_EXTERNAL_LINKAGE@
 MOZ_SUNBIRD	= @MOZ_SUNBIRD@
 MOZ_SUITE	= @MOZ_SUITE@
 WINCE		= @WINCE@
 WINCE_WINDOWS_MOBILE = @WINCE_WINDOWS_MOBILE@
 
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
--- a/configure.in
+++ b/configure.in
@@ -4553,17 +4553,16 @@ MOZ_PLUGINS=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_PROFILELOCKING=1
 MOZ_PSM=1
 MOZ_RDF=1
 MOZ_SAFE_BROWSING=
 MOZ_FASTSTART=
 MOZ_HELP_VIEWER=
 MOZ_SPELLCHECK=1
-MOZ_STATIC_MAIL_BUILD=
 MOZ_STORAGE=1
 MOZ_TIMELINE=
 MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
 MOZ_URL_CLASSIFIER=
 MOZ_USE_NATIVE_UCONV=
 MOZ_XSLT_STANDALONE=
 MOZ_XTF=1
@@ -6676,36 +6675,16 @@ if test -n "$MOZ_ENABLE_LIBXUL"; then
     AC_DEFINE(MOZ_ENABLE_LIBXUL)
 else
     if test -n "$BUILD_STATIC_LIBS"; then
         AC_DEFINE(MOZ_STATIC_BUILD)
     fi
     XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS"
 fi
 
-dnl Disable static mail in debug builds, but not with libxul.
-if test -n "$MOZ_DEBUG" -a -z "$MOZ_ENABLE_LIBXUL"; then
-   MOZ_STATIC_MAIL_BUILD=
-fi
-
-MOZ_ARG_ENABLE_BOOL(static-mail,
-[  --enable-static-mail Enable static mail build support],
-    MOZ_STATIC_MAIL_BUILD=1,
-    MOZ_STATIC_MAIL_BUILD= )
-
-if test -z "$MOZ_STATIC_MAIL_BUILD" -a -n "$BUILD_STATIC_LIBS"; then
-    AC_MSG_ERROR([--disable-static-mail is not compatible with --enable-static])
-fi
-
-if test -n "$MOZ_STATIC_MAIL_BUILD"; then
-    AC_DEFINE(MOZ_STATIC_MAIL_BUILD)
-fi
-
-AC_SUBST(MOZ_STATIC_MAIL_BUILD)
-
 MOZ_ARG_ENABLE_BOOL(incomplete-external-linkage,
 [  --enable-incomplete-external-linkage Changes some comm-central code to be built with external linkage. Developer only option, incomplete broken builds will result - There are already existing bugs for this. ],
     MOZ_INCOMPLETE_EXTERNAL_LINKAGE=1,
     MOZ_INCOMPLETE_EXTERNAL_LINKAGE= )
 
 AC_SUBST(MOZ_INCOMPLETE_EXTERNAL_LINKAGE)
 
 dnl ========================================================
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -41,17 +41,16 @@ MOZ_UPDATER=1
 MOZ_THUNDERBIRD=1
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
-MOZ_STATIC_MAIL_BUILD=1
 MOZ_COMPOSER=1
 MOZ_SAFE_BROWSING=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
 MOZ_APP_COMPONENT_LIBS="xpautocomplete mailcomps $MAIL_COMPONENT $LDAP_COMPONENT"
 MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE"
 MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 
--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -65,21 +65,17 @@ PARALLEL_DIRS += \
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 PARALLEL_DIRS += mapi/mapiDLL mapi/mapihook
 endif
 endif
 
-ifdef MOZ_STATIC_MAIL_BUILD
 DIRS += build
-else
-DIRS += base/build
-endif
 
 PREF_JS_EXPORTS = $(srcdir)/mailnews.js
 
 DEFINES += -DOS_ARCH=$(OS_ARCH) \
            -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
            $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/addrbook/Makefile.in
+++ b/mailnews/addrbook/Makefile.in
@@ -44,14 +44,10 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS	= public src
 
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += test
 endif
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS = build
-endif
-
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100644
--- a/mailnews/addrbook/build/Makefile.in
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= addrbook
-LIBRARY_NAME	= addrbook
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsAbModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
-
-CPPSRCS		= nsAbFactory.cpp
-
-ifdef MOZ_LDAP_XPCOM
-DEFINES		+= -DMOZ_LDAP_XPCOM
-endif
-
-SHARED_LIBRARY_LIBS = \
-	../src/$(LIB_PREFIX)addrbook_s.$(LIB_SUFFIX) \
-	$(NULL)
-
-EXTRA_DSO_LIBS += msgbaseutil
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
-	$(EXTRA_DSO_LIBS) \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-ifeq ($(OS_ARCH),Darwin)
-EXTRA_DSO_LDOPTS += \
-    $(TK_LIBS) \
-    -framework Cocoa \
-    $(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/addrbook/build/nsAbFactory.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mozilla/ModuleUtils.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIModule.h"
-
-#include "nsAbBaseCID.h"
-#include "pratom.h"
-#include "nsICategoryManager.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "rdf.h"
-#include "nsCOMPtr.h"
-
-#include "nsDirectoryDataSource.h"
-#include "nsAbBSDirectory.h"
-#include "nsAbMDBDirectory.h"
-#include "nsAbMDBCard.h"
-#include "nsAbDirFactoryService.h"
-#include "nsAbMDBDirFactory.h"
-#include "nsAddrDatabase.h"
-#include "nsAbManager.h"
-#include "nsAbContentHandler.h"
-#include "nsAbDirProperty.h"
-#include "nsAbAddressCollector.h"
-#include "nsAddbookProtocolHandler.h"
-#include "nsAddbookUrl.h"
-#include "nsCURILoader.h"
-
-#include "nsAbDirectoryQuery.h"
-#include "nsAbBooleanExpression.h"
-#include "nsAbDirectoryQueryProxy.h"
-#include "nsAbView.h"
-#include "nsMsgVCardService.h"
-#include "nsAbLDIFService.h"
-
-#if defined(MOZ_LDAP_XPCOM)
-#include "nsAbLDAPDirectory.h"
-#include "nsAbLDAPDirectoryQuery.h"
-#include "nsAbLDAPCard.h"
-#include "nsAbLDAPDirFactory.h"
-#include "nsAbLDAPAutoCompFormatter.h"
-#include "nsAbLDAPReplicationService.h"
-#include "nsAbLDAPReplicationQuery.h"
-#include "nsAbLDAPReplicationData.h"
-// XXX These files are not being built as they don't work. Bug 311632 should
-// fix them.
-//#include "nsAbLDAPChangeLogQuery.h"
-//#include "nsAbLDAPChangeLogData.h"
-#include "nsLDAPAutoCompleteSession.h"
-#endif
-
-#if defined(XP_WIN) && !defined(__MINGW32__)
-#include "nsAbOutlookDirFactory.h"
-#include "nsAbOutlookDirectory.h"
-#endif
-
-#ifdef XP_MACOSX
-#include "nsAbOSXDirectory.h"
-#include "nsAbOSXCard.h"
-#include "nsAbOSXDirFactory.h"
-#endif
-
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAbManager,Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbContentHandler)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAbDirectoryDataSource,Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbDirProperty)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbCardProperty)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbBSDirectory)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbMDBDirectory)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbMDBCard)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAddrDatabase)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAbAddressCollector,Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAddbookUrl)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbDirFactoryService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbMDBDirFactory)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAddbookProtocolHandler)
-
-#if defined(XP_WIN) && !defined(__MINGW32__)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbOutlookDirectory)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbOutlookDirFactory)
-#endif
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbDirectoryQueryArguments)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbBooleanConditionString)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbBooleanExpression)
-
-#if defined(MOZ_LDAP_XPCOM)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPDirectory)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPDirectoryQuery)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPCard)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPDirFactory)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPAutoCompFormatter)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPReplicationService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPReplicationQuery)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessReplicationData)
-// XXX These files are not being built as they don't work. Bug 311632 should
-// fix them.
-//NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPChangeLogQuery)
-//NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessChangeLogData)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPAutoCompleteSession)
-#endif
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbDirectoryQueryProxy)
-
-#ifdef XP_MACOSX
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbOSXDirectory)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbOSXCard)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbOSXDirFactory)
-#endif
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbView)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgVCardService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDIFService)
-
-NS_DEFINE_NAMED_CID(NS_ABMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_ABDIRECTORYDATASOURCE_CID);
-NS_DEFINE_NAMED_CID(NS_ABDIRECTORY_CID);
-NS_DEFINE_NAMED_CID(NS_ABMDBDIRECTORY_CID);
-NS_DEFINE_NAMED_CID(NS_ABMDBCARD_CID);
-NS_DEFINE_NAMED_CID(NS_ADDRDATABASE_CID);
-NS_DEFINE_NAMED_CID(NS_ABCARDPROPERTY_CID);
-NS_DEFINE_NAMED_CID(NS_ABDIRPROPERTY_CID);
-NS_DEFINE_NAMED_CID(NS_ABADDRESSCOLLECTOR_CID);
-NS_DEFINE_NAMED_CID(NS_ADDBOOKURL_CID);
-NS_DEFINE_NAMED_CID(NS_ADDBOOK_HANDLER_CID);
-NS_DEFINE_NAMED_CID(NS_ABCONTENTHANDLER_CID);
-NS_DEFINE_NAMED_CID(NS_ABDIRFACTORYSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_ABMDBDIRFACTORY_CID);
-NS_DEFINE_NAMED_CID(NS_ABDIRECTORYQUERYARGUMENTS_CID);
-NS_DEFINE_NAMED_CID(NS_BOOLEANCONDITIONSTRING_CID);
-NS_DEFINE_NAMED_CID(NS_BOOLEANEXPRESSION_CID);
-#if defined(XP_WIN) && !defined(__MINGW32__)
-NS_DEFINE_NAMED_CID(NS_ABOUTLOOKDIRECTORY_CID);
-NS_DEFINE_NAMED_CID(NS_ABOUTLOOKDIRFACTORY_CID);
-#endif
-#if defined(MOZ_LDAP_XPCOM)
-NS_DEFINE_NAMED_CID(NS_ABLDAPDIRECTORY_CID);
-NS_DEFINE_NAMED_CID(NS_ABLDAPDIRECTORYQUERY_CID);
-NS_DEFINE_NAMED_CID(NS_ABLDAPCARD_CID);
-NS_DEFINE_NAMED_CID(NS_ABLDAPDIRFACTORY_CID);
-NS_DEFINE_NAMED_CID(NS_ABLDAP_REPLICATIONSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_ABLDAP_REPLICATIONQUERY_CID);
-NS_DEFINE_NAMED_CID(NS_ABLDAP_PROCESSREPLICATIONDATA_CID);
-NS_DEFINE_NAMED_CID(NS_ABLDAPAUTOCOMPFORMATTER_CID);
-NS_DEFINE_NAMED_CID(NS_LDAPAUTOCOMPLETESESSION_CID);
-#endif
-NS_DEFINE_NAMED_CID(NS_ABDIRECTORYQUERYPROXY_CID);
-#ifdef XP_MACOSX
-NS_DEFINE_NAMED_CID(NS_ABOSXDIRECTORY_CID);
-NS_DEFINE_NAMED_CID(NS_ABOSXCARD_CID);
-NS_DEFINE_NAMED_CID(NS_ABOSXDIRFACTORY_CID);
-#endif
-NS_DEFINE_NAMED_CID(NS_ABVIEW_CID);
-NS_DEFINE_NAMED_CID(NS_MSGVCARDSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_ABLDIFSERVICE_CID);
-
-const mozilla::Module::CIDEntry kAddressBookCIDs[] = {
-  { &kNS_ABMANAGER_CID, false, NULL, nsAbManagerConstructor },
-  { &kNS_ABDIRECTORYDATASOURCE_CID, false, NULL, nsAbDirectoryDataSourceConstructor },
-  { &kNS_ABDIRECTORY_CID, false, NULL, nsAbBSDirectoryConstructor },
-  { &kNS_ABMDBDIRECTORY_CID, false, NULL, nsAbMDBDirectoryConstructor },
-  { &kNS_ABMDBCARD_CID, false, NULL, nsAbMDBCardConstructor },
-  { &kNS_ADDRDATABASE_CID, false, NULL, nsAddrDatabaseConstructor },
-  { &kNS_ABCARDPROPERTY_CID, false, NULL, nsAbCardPropertyConstructor },
-  { &kNS_ABDIRPROPERTY_CID, false, NULL, nsAbDirPropertyConstructor },
-  { &kNS_ABADDRESSCOLLECTOR_CID, false, NULL, nsAbAddressCollectorConstructor },
-  { &kNS_ADDBOOKURL_CID, false, NULL, nsAddbookUrlConstructor },
-  { &kNS_ADDBOOK_HANDLER_CID, false, NULL, nsAddbookProtocolHandlerConstructor },
-  { &kNS_ABCONTENTHANDLER_CID, false, NULL, nsAbContentHandlerConstructor },
-  { &kNS_ABDIRFACTORYSERVICE_CID, false, NULL, nsAbDirFactoryServiceConstructor },
-  { &kNS_ABMDBDIRFACTORY_CID, false, NULL, nsAbMDBDirFactoryConstructor },
-#if defined(XP_WIN) && !defined(__MINGW32__)
-  { &kNS_ABOUTLOOKDIRECTORY_CID, false, NULL, nsAbOutlookDirectoryConstructor },
-  { &kNS_ABOUTLOOKDIRFACTORY_CID, false, NULL, nsAbOutlookDirFactoryConstructor },
-#endif
-  { &kNS_ABDIRECTORYQUERYARGUMENTS_CID, false, NULL, nsAbDirectoryQueryArgumentsConstructor },
-  { &kNS_BOOLEANCONDITIONSTRING_CID, false, NULL, nsAbBooleanConditionStringConstructor },
-  { &kNS_BOOLEANEXPRESSION_CID, false, NULL, nsAbBooleanExpressionConstructor },
-#if defined(MOZ_LDAP_XPCOM)
-  { &kNS_ABLDAPDIRECTORY_CID, false, NULL, nsAbLDAPDirectoryConstructor },
-  { &kNS_ABLDAPDIRECTORYQUERY_CID, false, NULL, nsAbLDAPDirectoryQueryConstructor },
-  { &kNS_ABLDAPCARD_CID, false, NULL, nsAbLDAPCardConstructor },
-  { &kNS_ABLDAP_REPLICATIONSERVICE_CID, false, NULL, nsAbLDAPReplicationServiceConstructor },
-  { &kNS_ABLDAP_REPLICATIONQUERY_CID, false, NULL, nsAbLDAPReplicationQueryConstructor },
-  { &kNS_ABLDAP_PROCESSREPLICATIONDATA_CID, false, NULL, nsAbLDAPProcessReplicationDataConstructor },
-  { &kNS_ABLDAPDIRFACTORY_CID, false, NULL, nsAbLDAPDirFactoryConstructor },
-  { &kNS_ABLDAPAUTOCOMPFORMATTER_CID, false, NULL, nsAbLDAPAutoCompFormatterConstructor },
-  { &kNS_LDAPAUTOCOMPLETESESSION_CID, false, NULL, nsLDAPAutoCompleteSessionConstructor },
-#endif
-  { &kNS_ABDIRECTORYQUERYPROXY_CID, false, NULL, nsAbDirectoryQueryProxyConstructor },
-#ifdef XP_MACOSX
-  { &kNS_ABOSXDIRECTORY_CID, false, NULL, nsAbOSXDirectoryConstructor },
-  { &kNS_ABOSXCARD_CID, false, NULL, nsAbOSXCardConstructor },
-  { &kNS_ABOSXDIRFACTORY_CID, false, NULL, nsAbOSXDirFactoryConstructor },
-#endif
-  { &kNS_ABVIEW_CID, false, NULL, nsAbViewConstructor },
-  { &kNS_MSGVCARDSERVICE_CID, false, NULL, nsMsgVCardServiceConstructor },
-  { &kNS_ABLDIFSERVICE_CID, false, NULL, nsAbLDIFServiceConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kAddressBookContracts[] = {
-  { NS_ABMANAGER_CONTRACTID, &kNS_ABMANAGER_CID },
-  { NS_ABMANAGERSTARTUPHANDLER_CONTRACTID, &kNS_ABMANAGER_CID},
-  { NS_ABDIRECTORYDATASOURCE_CONTRACTID, &kNS_ABDIRECTORYDATASOURCE_CID},
-  { NS_ABDIRECTORY_CONTRACTID, &kNS_ABDIRECTORY_CID},
-  { NS_ABMDBDIRECTORY_CONTRACTID, &kNS_ABMDBDIRECTORY_CID},
-  { NS_ABMDBCARD_CONTRACTID, &kNS_ABMDBCARD_CID},
-  { NS_ADDRDATABASE_CONTRACTID, &kNS_ADDRDATABASE_CID},
-  { NS_ABCARDPROPERTY_CONTRACTID, &kNS_ABCARDPROPERTY_CID},
-  { NS_ABDIRPROPERTY_CONTRACTID, &kNS_ABDIRPROPERTY_CID},
-  { NS_ABADDRESSCOLLECTOR_CONTRACTID, &kNS_ABADDRESSCOLLECTOR_CID},
-  { NS_ADDBOOKURL_CONTRACTID, &kNS_ADDBOOKURL_CID},
-  { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "addbook", &kNS_ADDBOOK_HANDLER_CID},
-  { NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/x-addvcard", &kNS_ABCONTENTHANDLER_CID},
-  { NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/x-vcard", &kNS_ABCONTENTHANDLER_CID},
-  { NS_ABDIRFACTORYSERVICE_CONTRACTID, &kNS_ABDIRFACTORYSERVICE_CID},
-  { NS_ABMDBDIRFACTORY_CONTRACTID, &kNS_ABMDBDIRFACTORY_CID},
-#if defined(XP_WIN) && !defined(__MINGW32__)
-  { NS_ABOUTLOOKDIRECTORY_CONTRACTID, &kNS_ABOUTLOOKDIRECTORY_CID},
-  { NS_ABOUTLOOKDIRFACTORY_CONTRACTID, &kNS_ABOUTLOOKDIRFACTORY_CID},
-#endif
-  { NS_ABDIRECTORYQUERYARGUMENTS_CONTRACTID, &kNS_ABDIRECTORYQUERYARGUMENTS_CID},
-  { NS_BOOLEANCONDITIONSTRING_CONTRACTID, &kNS_BOOLEANCONDITIONSTRING_CID},
-  { NS_BOOLEANEXPRESSION_CONTRACTID, &kNS_BOOLEANEXPRESSION_CID},
-#if defined(MOZ_LDAP_XPCOM)
-  { NS_ABLDAPDIRECTORY_CONTRACTID, &kNS_ABLDAPDIRECTORY_CID},
-  { NS_ABLDAPDIRECTORYQUERY_CONTRACTID, &kNS_ABLDAPDIRECTORYQUERY_CID},
-  { NS_ABLDAPCARD_CONTRACTID, &kNS_ABLDAPCARD_CID},
-  { NS_ABLDAPDIRFACTORY_CONTRACTID, &kNS_ABLDAPDIRFACTORY_CID},
-  { NS_ABLDAP_REPLICATIONSERVICE_CONTRACTID, &kNS_ABLDAP_REPLICATIONSERVICE_CID},
-  { NS_ABLDAP_REPLICATIONQUERY_CONTRACTID, &kNS_ABLDAP_REPLICATIONQUERY_CID},
-  { NS_ABLDAP_PROCESSREPLICATIONDATA_CONTRACTID, &kNS_ABLDAP_PROCESSREPLICATIONDATA_CID},
-  { NS_ABLDAPACDIRFACTORY_CONTRACTID, &kNS_ABLDAPDIRFACTORY_CID},
-  { NS_ABLDAPSACDIRFACTORY_CONTRACTID, &kNS_ABLDAPDIRFACTORY_CID},
-  { NS_ABLDAPAUTOCOMPFORMATTER_CONTRACTID, &kNS_ABLDAPAUTOCOMPFORMATTER_CID},
-  { "@mozilla.org/autocompleteSession;1?type=ldap", &kNS_LDAPAUTOCOMPLETESESSION_CID},
-#endif
-  { NS_ABDIRECTORYQUERYPROXY_CONTRACTID, &kNS_ABDIRECTORYQUERYPROXY_CID},
-#ifdef XP_MACOSX
-  { NS_ABOSXDIRECTORY_CONTRACTID, &kNS_ABOSXDIRECTORY_CID},
-  { NS_ABOSXCARD_CONTRACTID, &kNS_ABOSXCARD_CID},
-  { NS_ABOSXDIRFACTORY_CONTRACTID, &kNS_ABOSXDIRFACTORY_CID},
-#endif
-  { NS_ABVIEW_CONTRACTID, &kNS_ABVIEW_CID},
-  { NS_MSGVCARDSERVICE_CONTRACTID, &kNS_MSGVCARDSERVICE_CID},
-  { NS_ABLDIFSERVICE_CONTRACTID, &kNS_ABLDIFSERVICE_CID},
-  { NULL }
-};
-
-static const mozilla::Module::CategoryEntry kAddressBookCategories[] = {
-  { "command-line-handler", "m-addressbook", NS_ABMANAGERSTARTUPHANDLER_CONTRACTID},
-  { NULL }
-};
-
-static void
-msgAbModuleDtor()
-{
-  nsAddrDatabase::CleanupCache();
-}
-
-static const mozilla::Module kAddressBookModule = {
-  mozilla::Module::kVersion,
-  kAddressBookCIDs,
-  kAddressBookContracts,
-  kAddressBookCategories,
-  NULL,
-  NULL,
-  msgAbModuleDtor
-};
-
-NSMODULE_DEFN(addressbook) = &kAddressBookModule;
-
-
deleted file mode 100644
--- a/mailnews/base/build/Makefile.in
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= msgbase
-LIBRARY_NAME	= msgbase
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsMsgBaseModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
-CPPSRCS		= nsMsgFactory.cpp
-
-SHARED_LIBRARY_LIBS = \
-		../src/$(LIB_PREFIX)msgbase_s.$(LIB_SUFFIX) \
-		../search/src/$(LIB_PREFIX)msgsearch_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-LOCAL_INCLUDES += -I$(srcdir) \
-		-I$(srcdir)/../src \
-		-I$(srcdir)/../search/src \
-		-I$(srcdir)/../util \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS	+= $(call EXPAND_LIBNAME,shell32)
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-OS_LIBS += -framework Carbon
-endif
deleted file mode 100644
--- a/mailnews/base/build/nsMsgFactory.cpp
+++ /dev/null
@@ -1,441 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Pierre Phaneuf <pp@ludusdesign.com>
- *   Seth Spitzer <sspitzer@netscape.com>
- *   Karsten Düsterloh <mnyromyr@tprac.de>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ****************************************************************************
- * ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
- * ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
- * 
- * ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
- * ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
- * 
- * Dear Mortals,
- * 
- * Please be advised that if you are adding something here, you should also
- * strongly consider adding it to mailnews/build/nsMailModule.cpp as well!
- * 
- * If you do not, your dynamic builds will be quite pleasant, but (static)
- * release builds will disappoint you by not having your component in them.
- * 
- * Yours truly,
- * The ghost that haunts the MailNews codebase.
- * 
- * ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
- * ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
- * 
- * ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
- * ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
- * ****************************************************************************/
-
-#include "mozilla/ModuleUtils.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "msgCore.h"
-#include "nsIModule.h"
-#include "nsMsgBaseCID.h"
-#include "pratom.h"
-#include "nsICategoryManager.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "rdf.h"
-#include "nsCOMPtr.h"
-
-#include "nsMessengerBootstrap.h"
-#include "nsMessenger.h"
-
-#include "nsIContentViewer.h"
-
-/* Include all of the interfaces our factory can generate components for */
-
-#include "nsMsgMailSession.h"
-#include "nsMsgAccount.h"
-#include "nsMsgAccountManager.h"
-#include "nsMsgIdentity.h"
-#include "nsMsgIncomingServer.h"
-#include "nsMsgFolderDataSource.h"
-
-#include "nsMsgAccountManagerDS.h"
-
-#include "nsMsgBiffManager.h"
-#include "nsMsgPurgeService.h"
-#include "nsStatusBarBiffManager.h"
-
-#include "nsCopyMessageStreamListener.h"
-#include "nsMsgCopyService.h"
-
-#include "nsMsgFolderCache.h"
-
-#include "nsMsgStatusFeedback.h"
-
-#include "nsMsgFilterService.h"
-#include "nsMsgWindow.h"
-
-#include "nsMsgServiceProvider.h"
-#include "nsSubscribeDataSource.h"
-#include "nsSubscribableServer.h"
-
-#ifdef NS_PRINTING
-#include "nsMsgPrintEngine.h"
-#endif
-#include "nsMsgSearchSession.h"
-#include "nsMsgSearchTerm.h"
-#include "nsMsgSearchAdapter.h"
-#include "nsMsgFolderCompactor.h"
-#include "nsMsgThreadedDBView.h"
-#include "nsMsgSpecialViews.h"
-#include "nsMsgXFVirtualFolderDBView.h"
-#include "nsMsgQuickSearchDBView.h"
-#include "nsMsgGroupView.h"
-
-#include "nsMsgOfflineManager.h"
-
-#include "nsMsgProgress.h"
-#include "nsSpamSettings.h"
-#include "nsMsgContentPolicy.h"
-#include "nsCidProtocolHandler.h"
-#include "nsMsgTagService.h"
-#include "nsMsgFolderNotificationService.h"
-
-#include "nsMailDirProvider.h"
-#include "nsServiceManagerUtils.h"
-
-#ifdef XP_WIN
-#include "nsMessengerWinIntegration.h"
-#endif
-#ifdef XP_OS2
-#include "nsMessengerOS2Integration.h"
-#endif
-#ifdef XP_MACOSX
-#include "nsMessengerOSXIntegration.h"
-#endif
-#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
-#include "nsMessengerUnixIntegration.h"
-#endif
-
-#include "nsCURILoader.h"
-#include "nsMessengerContentHandler.h"
-
-#include "nsStopwatch.h"
-
-#include "MailNewsDLF.h"
-
-using namespace mozilla::mailnews;
-
-// private factory declarations for each component we know how to produce
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMessengerBootstrap)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgMailSession, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMessenger)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgAccountManager, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgAccount)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgIdentity)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgFolderDataSource, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgUnreadFoldersDataSource, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgFavoriteFoldersDataSource, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgRecentFoldersDataSource, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgAccountManagerDataSource, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgSearchSession)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgSearchTerm)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgSearchValidityManager)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgFilterService)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgBiffManager, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgPurgeService)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsStatusBarBiffManager, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsCopyMessageStreamListener)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgCopyService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgFolderCache)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgStatusFeedback)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgWindow,Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgServiceProviderService, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSubscribeDataSource, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSubscribableServer, Init)
-#ifdef NS_PRINTING
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgPrintEngine)
-#endif
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsFolderCompactState)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsOfflineStoreCompactState)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgThreadedDBView)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgThreadsWithUnreadDBView)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgWatchedThreadsWithUnreadDBView)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgSearchDBView)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgXFVirtualFolderDBView)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgQuickSearchDBView)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgGroupView)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgOfflineManager)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgProgress)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSpamSettings)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsCidProtocolHandler)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgTagService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgFolderNotificationService)
-#ifdef XP_WIN
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMessengerWinIntegration, Init)
-#endif
-#ifdef XP_OS2
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMessengerOS2Integration, Init)
-#endif
-#ifdef XP_MACOSX
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMessengerOSXIntegration, Init)
-#endif
-#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMessengerUnixIntegration, Init)
-#endif
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMessengerContentHandler)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgContentPolicy, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMailDirProvider)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgShutdownService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsStopwatch)
-NS_GENERIC_FACTORY_CONSTRUCTOR(MailNewsDLF)
-
-NS_DEFINE_NAMED_CID(NS_MESSENGERBOOTSTRAP_CID);
-NS_DEFINE_NAMED_CID(NS_MESSENGERWINDOWSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_MSGMAILSESSION_CID);
-NS_DEFINE_NAMED_CID(NS_MESSENGER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGACCOUNTMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGACCOUNT_CID);
-NS_DEFINE_NAMED_CID(NS_MSGIDENTITY_CID);
-NS_DEFINE_NAMED_CID(NS_MAILNEWSFOLDERDATASOURCE_CID);
-NS_DEFINE_NAMED_CID(NS_MAILNEWSUNREADFOLDERDATASOURCE_CID);
-NS_DEFINE_NAMED_CID(NS_MAILNEWSFAVORITEFOLDERDATASOURCE_CID);
-NS_DEFINE_NAMED_CID(NS_MAILNEWSRECENTFOLDERDATASOURCE_CID);
-NS_DEFINE_NAMED_CID(NS_MSGACCOUNTMANAGERDATASOURCE_CID);
-NS_DEFINE_NAMED_CID(NS_MSGFILTERSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_MSGSEARCHSESSION_CID);
-NS_DEFINE_NAMED_CID(NS_MSGSEARCHTERM_CID);
-NS_DEFINE_NAMED_CID(NS_MSGSEARCHVALIDITYMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGBIFFMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGPURGESERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_STATUSBARBIFFMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_COPYMESSAGESTREAMLISTENER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGCOPYSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_MSGFOLDERCACHE_CID);
-NS_DEFINE_NAMED_CID(NS_MSGSTATUSFEEDBACK_CID);
-NS_DEFINE_NAMED_CID(NS_MSGWINDOW_CID);
-#ifdef NS_PRINTING
-NS_DEFINE_NAMED_CID(NS_MSG_PRINTENGINE_CID);
-#endif
-NS_DEFINE_NAMED_CID(NS_MSGSERVICEPROVIDERSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_SUBSCRIBEDATASOURCE_CID);
-NS_DEFINE_NAMED_CID(NS_SUBSCRIBABLESERVER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGLOCALFOLDERCOMPACTOR_CID);
-NS_DEFINE_NAMED_CID(NS_MSG_OFFLINESTORECOMPACTOR_CID);
-NS_DEFINE_NAMED_CID(NS_MSGTHREADEDDBVIEW_CID);
-NS_DEFINE_NAMED_CID(NS_MSGTHREADSWITHUNREADDBVIEW_CID);
-NS_DEFINE_NAMED_CID(NS_MSGWATCHEDTHREADSWITHUNREADDBVIEW_CID);
-NS_DEFINE_NAMED_CID(NS_MSGSEARCHDBVIEW_CID);
-NS_DEFINE_NAMED_CID(NS_MSGQUICKSEARCHDBVIEW_CID);
-NS_DEFINE_NAMED_CID(NS_MSG_XFVFDBVIEW_CID);
-NS_DEFINE_NAMED_CID(NS_MSG_GROUPDBVIEW_CID);
-NS_DEFINE_NAMED_CID(NS_MSGOFFLINEMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGPROGRESS_CID);
-NS_DEFINE_NAMED_CID(NS_SPAMSETTINGS_CID);
-NS_DEFINE_NAMED_CID(NS_CIDPROTOCOL_CID);
-NS_DEFINE_NAMED_CID(NS_MSGTAGSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_MSGNOTIFICATIONSERVICE_CID);
-#ifdef XP_WIN
-NS_DEFINE_NAMED_CID(NS_MESSENGERWININTEGRATION_CID);
-#endif
-#ifdef XP_OS2
-NS_DEFINE_NAMED_CID(NS_MESSENGEROS2INTEGRATION_CID);
-#endif
-#ifdef XP_MACOSX
-NS_DEFINE_NAMED_CID(NS_MESSENGEROSXINTEGRATION_CID);
-#endif
-#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
-NS_DEFINE_NAMED_CID(NS_MESSENGERUNIXINTEGRATION_CID);
-#endif
-NS_DEFINE_NAMED_CID(NS_MESSENGERCONTENTHANDLER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGCONTENTPOLICY_CID);
-NS_DEFINE_NAMED_CID(NS_MSGSHUTDOWNSERVICE_CID);
-NS_DEFINE_NAMED_CID(MAILDIRPROVIDER_CID);
-NS_DEFINE_NAMED_CID(NS_STOPWATCH_CID);
-NS_DEFINE_NAMED_CID(NS_MAILNEWSDLF_CID);
-
-const mozilla::Module::CIDEntry kMailNewsBaseCIDs[] = {
-  { &kNS_MESSENGERBOOTSTRAP_CID, false, NULL, nsMessengerBootstrapConstructor },
-  { &kNS_MESSENGERWINDOWSERVICE_CID, false, NULL, nsMessengerBootstrapConstructor },
-  { &kNS_MSGMAILSESSION_CID, false, NULL, nsMsgMailSessionConstructor },
-  { &kNS_MESSENGER_CID, false, NULL, nsMessengerConstructor },
-  { &kNS_MSGACCOUNTMANAGER_CID, false, NULL, nsMsgAccountManagerConstructor },
-  { &kNS_MSGACCOUNT_CID, false, NULL, nsMsgAccountConstructor },
-  { &kNS_MSGIDENTITY_CID, false, NULL, nsMsgIdentityConstructor },
-  { &kNS_MAILNEWSFOLDERDATASOURCE_CID, false, NULL, nsMsgFolderDataSourceConstructor },
-  { &kNS_MAILNEWSUNREADFOLDERDATASOURCE_CID, false, NULL, nsMsgUnreadFoldersDataSourceConstructor },
-  { &kNS_MAILNEWSFAVORITEFOLDERDATASOURCE_CID, false, NULL, nsMsgFavoriteFoldersDataSourceConstructor },
-  { &kNS_MAILNEWSRECENTFOLDERDATASOURCE_CID, false, NULL, nsMsgRecentFoldersDataSourceConstructor },
-  { &kNS_MSGACCOUNTMANAGERDATASOURCE_CID, false, NULL, nsMsgAccountManagerDataSourceConstructor },
-  { &kNS_MSGFILTERSERVICE_CID, false, NULL, nsMsgFilterServiceConstructor },
-  { &kNS_MSGSEARCHSESSION_CID, false, NULL, nsMsgSearchSessionConstructor },
-  { &kNS_MSGSEARCHTERM_CID, false, NULL, nsMsgSearchTermConstructor },
-  { &kNS_MSGSEARCHVALIDITYMANAGER_CID, false, NULL, nsMsgSearchValidityManagerConstructor },
-  { &kNS_MSGBIFFMANAGER_CID, false, NULL, nsMsgBiffManagerConstructor },
-  { &kNS_MSGPURGESERVICE_CID, false, NULL, nsMsgPurgeServiceConstructor },
-  { &kNS_STATUSBARBIFFMANAGER_CID, false, NULL, nsStatusBarBiffManagerConstructor },
-  { &kNS_COPYMESSAGESTREAMLISTENER_CID, false, NULL, nsCopyMessageStreamListenerConstructor },
-  { &kNS_MSGCOPYSERVICE_CID, false, NULL, nsMsgCopyServiceConstructor },
-  { &kNS_MSGFOLDERCACHE_CID, false, NULL, nsMsgFolderCacheConstructor },
-  { &kNS_MSGSTATUSFEEDBACK_CID, false, NULL, nsMsgStatusFeedbackConstructor },
-  { &kNS_MSGWINDOW_CID, false, NULL, nsMsgWindowConstructor },
-#ifdef NS_PRINTING
-  { &kNS_MSG_PRINTENGINE_CID, false, NULL, nsMsgPrintEngineConstructor },
-#endif
-  { &kNS_MSGSERVICEPROVIDERSERVICE_CID, false, NULL, nsMsgServiceProviderServiceConstructor },
-  { &kNS_SUBSCRIBEDATASOURCE_CID, false, NULL, nsSubscribeDataSourceConstructor },
-  { &kNS_SUBSCRIBABLESERVER_CID, false, NULL, nsSubscribableServerConstructor },
-  { &kNS_MSGLOCALFOLDERCOMPACTOR_CID, false, NULL, nsFolderCompactStateConstructor },
-  { &kNS_MSG_OFFLINESTORECOMPACTOR_CID, false, NULL, nsOfflineStoreCompactStateConstructor },
-  { &kNS_MSGTHREADEDDBVIEW_CID, false, NULL, nsMsgThreadedDBViewConstructor },
-  { &kNS_MSGTHREADSWITHUNREADDBVIEW_CID, false, NULL, nsMsgThreadsWithUnreadDBViewConstructor },
-  { &kNS_MSGWATCHEDTHREADSWITHUNREADDBVIEW_CID, false, NULL, nsMsgWatchedThreadsWithUnreadDBViewConstructor },
-  { &kNS_MSGSEARCHDBVIEW_CID, false, NULL, nsMsgSearchDBViewConstructor },
-  { &kNS_MSGQUICKSEARCHDBVIEW_CID, false, NULL, nsMsgQuickSearchDBViewConstructor },
-  { &kNS_MSG_XFVFDBVIEW_CID, false, NULL, nsMsgXFVirtualFolderDBViewConstructor },
-  { &kNS_MSG_GROUPDBVIEW_CID, false, NULL, nsMsgGroupViewConstructor },
-  { &kNS_MSGOFFLINEMANAGER_CID, false, NULL, nsMsgOfflineManagerConstructor },
-  { &kNS_MSGPROGRESS_CID, false, NULL, nsMsgProgressConstructor },
-  { &kNS_SPAMSETTINGS_CID, false, NULL, nsSpamSettingsConstructor },
-  { &kNS_CIDPROTOCOL_CID, false, NULL, nsCidProtocolHandlerConstructor },
-  { &kNS_MSGTAGSERVICE_CID, false, NULL, nsMsgTagServiceConstructor },
-  { &kNS_MSGNOTIFICATIONSERVICE_CID, false, NULL, nsMsgFolderNotificationServiceConstructor },
-#ifdef XP_WIN
-  { &kNS_MESSENGERWININTEGRATION_CID, false, NULL, nsMessengerWinIntegrationConstructor },
-#endif
-#ifdef XP_OS2
-  { &kNS_MESSENGEROS2INTEGRATION_CID, false, NULL, nsMessengerOS2IntegrationConstructor },
-#endif
-#ifdef XP_MACOSX
-  { &kNS_MESSENGEROSXINTEGRATION_CID, false, NULL, nsMessengerOSXIntegrationConstructor },
-#endif
-#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
-  { &kNS_MESSENGERUNIXINTEGRATION_CID, false, NULL, nsMessengerUnixIntegrationConstructor },
-#endif
-  { &kNS_MESSENGERCONTENTHANDLER_CID, false, NULL, nsMessengerContentHandlerConstructor },
-  { &kNS_MSGCONTENTPOLICY_CID, false, NULL, nsMsgContentPolicyConstructor },
-  { &kNS_MSGSHUTDOWNSERVICE_CID, false, NULL, nsMsgShutdownServiceConstructor },
-  { &kMAILDIRPROVIDER_CID, false, NULL, nsMailDirProviderConstructor },
-  { &kNS_STOPWATCH_CID, false, NULL, nsStopwatchConstructor },
-  { &kNS_MAILNEWSDLF_CID, false, NULL, MailNewsDLFConstructor },
-  {NULL}
-};
-
-const mozilla::Module::ContractIDEntry kMailNewsBaseContracts[] = {
-  { NS_MESSENGERBOOTSTRAP_CONTRACTID, &kNS_MESSENGERBOOTSTRAP_CID },
-  { NS_MESSENGERWINDOWSERVICE_CONTRACTID, &kNS_MESSENGERWINDOWSERVICE_CID },
-  { NS_MSGMAILSESSION_CONTRACTID, &kNS_MSGMAILSESSION_CID },
-  { NS_MESSENGER_CONTRACTID, &kNS_MESSENGER_CID },
-  { NS_MSGACCOUNTMANAGER_CONTRACTID, &kNS_MSGACCOUNTMANAGER_CID },
-  { NS_MSGACCOUNT_CONTRACTID, &kNS_MSGACCOUNT_CID },
-  { NS_MSGIDENTITY_CONTRACTID, &kNS_MSGIDENTITY_CID },
-  { NS_MAILNEWSFOLDERDATASOURCE_CONTRACTID, &kNS_MAILNEWSFOLDERDATASOURCE_CID },
-  { NS_MAILNEWSUNREADFOLDERDATASOURCE_CONTRACTID, &kNS_MAILNEWSUNREADFOLDERDATASOURCE_CID },
-  { NS_MAILNEWSFAVORITEFOLDERDATASOURCE_CONTRACTID, &kNS_MAILNEWSFAVORITEFOLDERDATASOURCE_CID },
-  { NS_MAILNEWSRECENTFOLDERDATASOURCE_CONTRACTID, &kNS_MAILNEWSRECENTFOLDERDATASOURCE_CID },
-  { NS_RDF_DATASOURCE_CONTRACTID_PREFIX "msgaccountmanager", &kNS_MSGACCOUNTMANAGERDATASOURCE_CID },
-  { NS_MSGFILTERSERVICE_CONTRACTID, &kNS_MSGFILTERSERVICE_CID },
-  { NS_MSGSEARCHSESSION_CONTRACTID, &kNS_MSGSEARCHSESSION_CID },
-  { NS_MSGSEARCHTERM_CONTRACTID, &kNS_MSGSEARCHTERM_CID },
-  { NS_MSGSEARCHVALIDITYMANAGER_CONTRACTID, &kNS_MSGSEARCHVALIDITYMANAGER_CID },
-  { NS_MSGBIFFMANAGER_CONTRACTID, &kNS_MSGBIFFMANAGER_CID },
-  { NS_MSGPURGESERVICE_CONTRACTID, &kNS_MSGPURGESERVICE_CID },
-  { NS_STATUSBARBIFFMANAGER_CONTRACTID, &kNS_STATUSBARBIFFMANAGER_CID },
-  { NS_COPYMESSAGESTREAMLISTENER_CONTRACTID, &kNS_COPYMESSAGESTREAMLISTENER_CID },
-  { NS_MSGCOPYSERVICE_CONTRACTID, &kNS_MSGCOPYSERVICE_CID },
-  { NS_MSGFOLDERCACHE_CONTRACTID, &kNS_MSGFOLDERCACHE_CID },
-  { NS_MSGSTATUSFEEDBACK_CONTRACTID, &kNS_MSGSTATUSFEEDBACK_CID },
-  { NS_MSGWINDOW_CONTRACTID, &kNS_MSGWINDOW_CID },
-#ifdef NS_PRINTING
-  { NS_MSGPRINTENGINE_CONTRACTID, &kNS_MSG_PRINTENGINE_CID },
-#endif
-  { NS_MSGSERVICEPROVIDERSERVICE_CONTRACTID, &kNS_MSGSERVICEPROVIDERSERVICE_CID },
-  { NS_SUBSCRIBEDATASOURCE_CONTRACTID, &kNS_SUBSCRIBEDATASOURCE_CID },
-  { NS_SUBSCRIBABLESERVER_CONTRACTID, &kNS_SUBSCRIBABLESERVER_CID },
-  { NS_MSGLOCALFOLDERCOMPACTOR_CONTRACTID, &kNS_MSGLOCALFOLDERCOMPACTOR_CID },
-  { NS_MSGOFFLINESTORECOMPACTOR_CONTRACTID, &kNS_MSG_OFFLINESTORECOMPACTOR_CID },
-  { NS_MSGTHREADEDDBVIEW_CONTRACTID, &kNS_MSGTHREADEDDBVIEW_CID },
-  { NS_MSGTHREADSWITHUNREADDBVIEW_CONTRACTID, &kNS_MSGTHREADSWITHUNREADDBVIEW_CID },
-  { NS_MSGWATCHEDTHREADSWITHUNREADDBVIEW_CONTRACTID, &kNS_MSGWATCHEDTHREADSWITHUNREADDBVIEW_CID },
-  { NS_MSGSEARCHDBVIEW_CONTRACTID, &kNS_MSGSEARCHDBVIEW_CID },
-  { NS_MSGQUICKSEARCHDBVIEW_CONTRACTID, &kNS_MSGQUICKSEARCHDBVIEW_CID },
-  { NS_MSGXFVFDBVIEW_CONTRACTID, &kNS_MSG_XFVFDBVIEW_CID },
-  { NS_MSGGROUPDBVIEW_CONTRACTID, &kNS_MSG_GROUPDBVIEW_CID },
-  { NS_MSGOFFLINEMANAGER_CONTRACTID, &kNS_MSGOFFLINEMANAGER_CID },
-  { NS_MSGPROGRESS_CONTRACTID, &kNS_MSGPROGRESS_CID },
-  { NS_SPAMSETTINGS_CONTRACTID, &kNS_SPAMSETTINGS_CID },
-  { NS_CIDPROTOCOLHANDLER_CONTRACTID, &kNS_CIDPROTOCOL_CID },
-  { NS_MSGTAGSERVICE_CONTRACTID, &kNS_MSGTAGSERVICE_CID },
-  { NS_MSGNOTIFICATIONSERVICE_CONTRACTID, &kNS_MSGNOTIFICATIONSERVICE_CID },
-#ifdef XP_WIN
-  { NS_MESSENGEROSINTEGRATION_CONTRACTID, &kNS_MESSENGERWININTEGRATION_CID },
-#endif
-#ifdef XP_OS2
-  { NS_MESSENGEROSINTEGRATION_CONTRACTID, &kNS_MESSENGEROS2INTEGRATION_CID },
-#endif
-#ifdef XP_MACOSX
-  { NS_MESSENGEROSINTEGRATION_CONTRACTID, &kNS_MESSENGEROSXINTEGRATION_CID },
-#endif
-#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
-  { NS_MESSENGEROSINTEGRATION_CONTRACTID, &kNS_MESSENGERUNIXINTEGRATION_CID },
-#endif
-  { NS_MESSENGERCONTENTHANDLER_CONTRACTID, &kNS_MESSENGERCONTENTHANDLER_CID },
-  { NS_MSGCONTENTPOLICY_CONTRACTID, &kNS_MSGCONTENTPOLICY_CID },
-  { NS_MSGSHUTDOWNSERVICE_CONTRACTID, &kNS_MSGSHUTDOWNSERVICE_CID },
-  { NS_MAILDIRPROVIDER_CONTRACTID, &kMAILDIRPROVIDER_CID },
-  { NS_STOPWATCH_CONTRACTID, &kNS_STOPWATCH_CID },
-  { NS_MAILNEWSDLF_CONTRACTID, &kNS_MAILNEWSDLF_CID },
-  { NULL }
-};
-
-static const mozilla::Module::CategoryEntry kMailNewsBaseCategories[] = {
-    { XPCOM_DIRECTORY_PROVIDER_CATEGORY, "mail-directory-provider", NS_MAILDIRPROVIDER_CONTRACTID },
-    { "content-policy", NS_MSGCONTENTPOLICY_CONTRACTID, NS_MSGCONTENTPOLICY_CONTRACTID },
-    MAILNEWSDLF_CATEGORIES
-#ifdef XP_MACOSX
-    { "app-startup", NS_MESSENGEROSINTEGRATION_CONTRACTID, "service," NS_MESSENGEROSINTEGRATION_CONTRACTID },
-#endif
-    { NULL }
-};
-
-static const mozilla::Module kMailNewsBaseModule = {
-  mozilla::Module::kVersion,
-  kMailNewsBaseCIDs,
-  kMailNewsBaseContracts,
-  kMailNewsBaseCategories
-};
-
-NSMODULE_DEFN(mailnewsbase_provider) = &kMailNewsBaseModule;
-
--- a/mailnews/base/public/msgCore.h
+++ b/mailnews/base/public/msgCore.h
@@ -201,25 +201,25 @@ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODUL
 #if defined(XP_WIN) || defined(XP_OS2)
 #define MSG_LINEBREAK "\015\012"
 #define MSG_LINEBREAK_LEN 2
 #else
 #define MSG_LINEBREAK "\012"
 #define MSG_LINEBREAK_LEN 1
 #endif
 
-#if defined(MOZ_STATIC_MAIL_BUILD) || defined(MOZ_ENABLE_LIBXUL)
+#if defined(MOZ_ENABLE_LIBXUL)
 #define NS_MSG_BASE
 #define NS_MSG_BASE_STATIC_MEMBER_(type) type
 #else
 
 #ifdef _IMPL_NS_MSG_BASE
 #define NS_MSG_BASE                      NS_EXPORT
 #define NS_MSG_BASE_STATIC_MEMBER_(type) NS_EXPORT_STATIC_MEMBER_(type)
 #else
 #define NS_MSG_BASE                      NS_IMPORT
 #define NS_MSG_BASE_STATIC_MEMBER_(type) NS_IMPORT_STATIC_MEMBER_(type)
 #endif
 
-#endif // MOZ_STATIC_MAIL_BUILD
+#endif // MOZ_ENABLE_LIBXUL
 
 #endif // msgCore_h__
 
--- a/mailnews/base/test/Makefile.in
+++ b/mailnews/base/test/Makefile.in
@@ -68,21 +68,17 @@ LOCAL_INCLUDES = \
 
 ifndef MOZILLA_INTERNAL_API
 LIBS += $(XPCOM_GLUE_LDOPTS)
 endif
 
 ifdef MOZ_ENABLE_LIBXUL
 LIBS += $(XPCOM_LIBS)
 else
-ifdef MOZ_STATIC_MAIL_BUILD
 LIBS +=   \
     ../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) \
     $(NULL)
-else
-LIBS +=   $(call EXPAND_LIBNAME_PATH,msgbaseutil,../../base/util)
-endif
 endif
 
 LIBS +=   \
   $(XPCOM_LIBS) \
   $(NSPR_LIBS) \
   $(NULL)
--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@@ -38,24 +38,17 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgbaseutil
-
-ifndef MOZ_STATIC_MAIL_BUILD
-LIBRARY_NAME	= msgbaseutil
-EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= msgbsutl
-else
 LIBRARY_NAME	= msgbsutl_s
-endif
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 CPPSRCS		= \
 		nsMsgLineBuffer.cpp \
 		nsMsgDBFolder.cpp \
 		nsMsgKeySet.cpp \
@@ -101,44 +94,19 @@ EXTRA_JS_MODULES = \
 		StringBundle.js \
 		templateUtils.js \
 		IOUtils.js \
 		mailnewsMigrator.js \
 		dictUtils.js \
 		mailServices.js \
 		$(NULL)
 
-ifndef MOZ_STATIC_MAIL_BUILD
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(ZLIB_LIBS) \
-	$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(ZLIB_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-else
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
-endif
-
 DEFINES		+= -D_IMPL_NS_MSG_BASE
 
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DZLIB_DLL
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/compose/Makefile.in
+++ b/mailnews/compose/Makefile.in
@@ -45,14 +45,10 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= msgcompose
 
 PARALLEL_DIRS	= public src
 
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += test
 endif
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS = build
-endif
-
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100644
--- a/mailnews/compose/build/Makefile.in
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= msgcompose
-LIBRARY_NAME	= msgcompose
-EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= msgcompo
-IS_COMPONENT	= 1
-MODULE_NAME	= nsMsgComposeModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-CPPSRCS		= nsMsgCompFactory.cpp
-
-SHARED_LIBRARY_LIBS = \
-		../src/$(LIB_PREFIX)msgcompose_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/compose/build/nsMsgCompFactory.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mozilla/ModuleUtils.h"
-#include "msgCore.h"
-
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
-
-#include "nsIFactory.h"
-#include "nsICategoryManager.h"
-#include "nsIServiceManager.h"
-#include "nsServiceManagerUtils.h"
-#include "nsIModule.h"
-
-#include "pratom.h"
-#include "nsMsgCompCID.h"
-
-/* Include all of the interfaces our factory can generate components for */
-#include "nsMsgSendLater.h"
-#include "nsSmtpUrl.h"
-#include "nsISmtpService.h"
-#include "nsSmtpService.h"
-#include "nsMsgComposeService.h"
-#include "nsMsgComposeContentHandler.h"
-#include "nsMsgCompose.h"
-#include "nsMsgComposeParams.h"
-#include "nsMsgComposeProgressParams.h"
-#include "nsMsgAttachment.h"
-#include "nsMsgSend.h"
-#include "nsMsgQuote.h"
-#include "nsURLFetcher.h"
-#include "nsSmtpServer.h"
-#include "nsMsgCompUtils.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSmtpService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSmtpServer)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgCompose)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgComposeParams)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgComposeSendListener)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgComposeProgressParams)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgCompFields)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgAttachment)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgComposeAndSend)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgSendLater, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgComposeService, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgComposeContentHandler)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgQuote)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgQuoteListener)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSmtpUrl)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMailtoUrl)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsURLFetcher)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgCompUtils)
-
-NS_DEFINE_NAMED_CID(NS_MSGCOMPOSE_CID);
-NS_DEFINE_NAMED_CID(NS_MSGCOMPOSESERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_MSGCOMPOSECONTENTHANDLER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGCOMPOSEPARAMS_CID);
-NS_DEFINE_NAMED_CID(NS_MSGCOMPOSESENDLISTENER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGCOMPOSEPROGRESSPARAMS_CID);
-NS_DEFINE_NAMED_CID(NS_MSGCOMPFIELDS_CID);
-NS_DEFINE_NAMED_CID(NS_MSGATTACHMENT_CID);
-NS_DEFINE_NAMED_CID(NS_MSGSEND_CID);
-NS_DEFINE_NAMED_CID(NS_MSGSENDLATER_CID);
-NS_DEFINE_NAMED_CID(NS_SMTPSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_SMTPSERVER_CID);
-NS_DEFINE_NAMED_CID(NS_SMTPURL_CID);
-NS_DEFINE_NAMED_CID(NS_MAILTOURL_CID);
-NS_DEFINE_NAMED_CID(NS_MSGQUOTE_CID);
-NS_DEFINE_NAMED_CID(NS_MSGQUOTELISTENER_CID);
-NS_DEFINE_NAMED_CID(NS_URLFETCHER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGCOMPUTILS_CID);
-
-const mozilla::Module::CIDEntry kMsgComposeCIDs[] = {
-  { &kNS_MSGCOMPOSE_CID, false, NULL, nsMsgComposeConstructor },
-  { &kNS_MSGCOMPOSESERVICE_CID, false, NULL, nsMsgComposeServiceConstructor },
-  { &kNS_MSGCOMPOSECONTENTHANDLER_CID, false, NULL, nsMsgComposeContentHandlerConstructor },
-  { &kNS_MSGCOMPOSEPARAMS_CID, false, NULL, nsMsgComposeParamsConstructor },
-  { &kNS_MSGCOMPOSESENDLISTENER_CID, false, NULL, nsMsgComposeSendListenerConstructor },
-  { &kNS_MSGCOMPOSEPROGRESSPARAMS_CID, false, NULL, nsMsgComposeProgressParamsConstructor },
-  { &kNS_MSGCOMPFIELDS_CID, false, NULL, nsMsgCompFieldsConstructor },
-  { &kNS_MSGATTACHMENT_CID, false, NULL, nsMsgAttachmentConstructor },
-  { &kNS_MSGSEND_CID, false, NULL, nsMsgComposeAndSendConstructor },
-  { &kNS_MSGSENDLATER_CID, false, NULL, nsMsgSendLaterConstructor },
-  { &kNS_SMTPSERVICE_CID, false, NULL, nsSmtpServiceConstructor },
-  { &kNS_SMTPSERVER_CID, false, NULL, nsSmtpServerConstructor },
-  { &kNS_SMTPURL_CID, false, NULL, nsSmtpUrlConstructor },
-  { &kNS_MAILTOURL_CID, false, NULL, nsMailtoUrlConstructor },
-  { &kNS_MSGQUOTE_CID, false, NULL, nsMsgQuoteConstructor },
-  { &kNS_MSGQUOTELISTENER_CID, false, NULL, nsMsgQuoteListenerConstructor },
-  { &kNS_URLFETCHER_CID, false, NULL, nsURLFetcherConstructor },
-  { &kNS_MSGCOMPUTILS_CID, false, NULL, nsMsgCompUtilsConstructor },
-  { NULL}
-};
-
-const mozilla::Module::ContractIDEntry kMsgComposeContracts[] = {
-  { NS_MSGCOMPOSE_CONTRACTID, &kNS_MSGCOMPOSE_CID },
-  { NS_MSGCOMPOSESERVICE_CONTRACTID, &kNS_MSGCOMPOSESERVICE_CID },
-  { NS_MSGCOMPOSESTARTUPHANDLER_CONTRACTID, &kNS_MSGCOMPOSESERVICE_CID },
-  { NS_MSGCOMPOSECONTENTHANDLER_CONTRACTID, &kNS_MSGCOMPOSECONTENTHANDLER_CID },
-  { NS_MSGCOMPOSEPARAMS_CONTRACTID, &kNS_MSGCOMPOSEPARAMS_CID },
-  { NS_MSGCOMPOSESENDLISTENER_CONTRACTID, &kNS_MSGCOMPOSESENDLISTENER_CID },
-  { NS_MSGCOMPOSEPROGRESSPARAMS_CONTRACTID, &kNS_MSGCOMPOSEPROGRESSPARAMS_CID },
-  { NS_MSGCOMPFIELDS_CONTRACTID, &kNS_MSGCOMPFIELDS_CID },
-  { NS_MSGATTACHMENT_CONTRACTID, &kNS_MSGATTACHMENT_CID },
-  { NS_MSGSEND_CONTRACTID, &kNS_MSGSEND_CID },
-  { NS_MSGSENDLATER_CONTRACTID, &kNS_MSGSENDLATER_CID },
-  { NS_SMTPSERVICE_CONTRACTID, &kNS_SMTPSERVICE_CID },
-  { NS_MAILTOHANDLER_CONTRACTID, &kNS_SMTPSERVICE_CID },
-  { NS_SMTPSERVER_CONTRACTID, &kNS_SMTPSERVER_CID },
-  { NS_SMTPURL_CONTRACTID, &kNS_SMTPURL_CID },
-  { NS_MAILTOURL_CONTRACTID, &kNS_MAILTOURL_CID },
-  { NS_MSGQUOTE_CONTRACTID, &kNS_MSGQUOTE_CID },
-  { NS_MSGQUOTELISTENER_CONTRACTID, &kNS_MSGQUOTELISTENER_CID },
-  { NS_URLFETCHER_CONTRACTID, &kNS_URLFETCHER_CID },
-  { NS_MSGCOMPUTILS_CONTRACTID, &kNS_MSGCOMPUTILS_CID },
-  { NULL }
-};
-
-static const mozilla::Module::CategoryEntry kMsgComposeCategories[] = {
-  { "command-line-handler", "m-compose",
-                                  NS_MSGCOMPOSESTARTUPHANDLER_CONTRACTID },
-  { NULL }
-};
-
-static const mozilla::Module kMsgComposeModule = {
-    mozilla::Module::kVersion,
-    kMsgComposeCIDs,
-    kMsgComposeContracts,
-    kMsgComposeCategories,
-    NULL,
-    NULL,
-    NULL
-};
-
-NSMODULE_DEFN(msg_compose) = &kMsgComposeModule;
-
--- a/mailnews/db/msgdb/Makefile.in
+++ b/mailnews/db/msgdb/Makefile.in
@@ -45,13 +45,9 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= msgdb
 
 PARALLEL_DIRS	= public src
 
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += test
 endif
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS = build
-endif
-
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/db/msgdb/build/Makefile.in
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= msgdb
-LIBRARY_NAME	= msgdb
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsMsgDBModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-CPPSRCS		= nsMsgDBFactory.cpp
-
-SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgdb_s.$(LIB_SUFFIX)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/db/msgdb/build/nsMsgDBFactory.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Pierre Phaneuf <pp@ludusdesign.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mozilla/ModuleUtils.h"
-#include "msgCore.h" // for pre-compiled headers...
-#include "nsCOMPtr.h"
-#include "nsIModule.h"
-#include "nsMsgDBCID.h"
-
-// include files for components this factory creates...
-#include "nsMailDatabase.h"
-#include "nsNewsDatabase.h"
-#include "nsImapMailDatabase.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMailDatabase)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNewsDatabase)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapMailDatabase)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgRetentionSettings)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgDownloadSettings)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgDBService)
-
-NS_DEFINE_NAMED_CID(NS_MAILDB_CID);
-NS_DEFINE_NAMED_CID(NS_NEWSDB_CID);
-NS_DEFINE_NAMED_CID(NS_IMAPDB_CID);
-NS_DEFINE_NAMED_CID(NS_MSG_RETENTIONSETTINGS_CID);
-NS_DEFINE_NAMED_CID(NS_MSG_DOWNLOADSETTINGS_CID);
-NS_DEFINE_NAMED_CID(NS_MSGDB_SERVICE_CID);
-
-const mozilla::Module::CIDEntry kMsgDBCIDs[] = {
-  { &kNS_MAILDB_CID, false, NULL, nsMailDatabaseConstructor },
-  { &kNS_NEWSDB_CID, false, NULL, nsNewsDatabaseConstructor },
-  { &kNS_IMAPDB_CID, false, NULL, nsImapMailDatabaseConstructor },
-  { &kNS_MSG_RETENTIONSETTINGS_CID, false, NULL, nsMsgRetentionSettingsConstructor },
-  { &kNS_MSG_DOWNLOADSETTINGS_CID, false, NULL, nsMsgDownloadSettingsConstructor },
-  { &kNS_MSGDB_SERVICE_CID, false, NULL, nsMsgDBServiceConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kMsgDBContracts[] = {
-  { NS_MAILBOXDB_CONTRACTID, &kNS_MAILDB_CID },
-  { NS_NEWSDB_CONTRACTID, &kNS_NEWSDB_CID },
-  { NS_IMAPDB_CONTRACTID, &kNS_IMAPDB_CID },
-  { NS_MSG_RETENTIONSETTINGS_CONTRACTID, &kNS_MSG_RETENTIONSETTINGS_CID },
-  { NS_MSG_DOWNLOADSETTINGS_CONTRACTID, &kNS_MSG_DOWNLOADSETTINGS_CID },
-  { NS_MSGDB_SERVICE_CONTRACTID, &kNS_MSGDB_SERVICE_CID },
-  { NULL }
-};
-
-static void
-msgDBModuleDtor()
-{
-  nsMsgDatabase::CleanupCache();
-}
-
-static const mozilla::Module kMsgDBModule = {
-    mozilla::Module::kVersion,
-    kMsgDBCIDs,
-    kMsgDBContracts,
-    NULL,
-    NULL,
-    NULL,
-    msgDBModuleDtor
-};
-
-NSMODULE_DEFN(msgdb) = &kMsgDBModule;
-
--- a/mailnews/extensions/bayesian-spam-filter/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/Makefile.in
@@ -46,13 +46,9 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= bayesflt
 
 PARALLEL_DIRS	= src
 
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += test
 endif
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS = build
-endif
-
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= bayesflt
-LIBRARY_NAME	= bayesflt
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsBayesianFilterModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-CPPSRCS		= nsBayesianFilterFactory.cpp
-
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-SHARED_LIBRARY_LIBS = \
-		../src/$(LIB_PREFIX)bayesflt_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/bayesian-spam-filter/build/nsBayesianFilterFactory.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Jeff Tsai <jt95070@netscape.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mozilla/ModuleUtils.h"
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
-
-#include "nsIFactory.h"
-#include "nsIServiceManager.h"
-#include "nsIModule.h"
-
-#include "nsBayesianFilterCID.h"
-
-/* Include all of the interfaces our factory can generate components for */
-#include "nsBayesianFilter.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsBayesianFilter)
-
-NS_DEFINE_NAMED_CID(NS_BAYESIANFILTER_CID);
-
-const mozilla::Module::CIDEntry kBayesianFilterCIDs[] = {
-  { &kNS_BAYESIANFILTER_CID, false, NULL, nsBayesianFilterConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kBayesianFilterContracts[] = {
-  { NS_BAYESIANFILTER_CONTRACTID, &kNS_BAYESIANFILTER_CID },
-  { NULL }
-};
-
-/////////////////////////////////////////////////////////////////////////////
-//
-/////////////////////////////////////////////////////////////////////////////
-
-static const mozilla::Module kBayesianFilterModule = {
-    mozilla::Module::kVersion,
-    kBayesianFilterCIDs,
-    kBayesianFilterContracts
-};
-
-NSMODULE_DEFN(bayesianfilter) = &kBayesianFilterModule;
--- a/mailnews/extensions/fts3/Makefile.in
+++ b/mailnews/extensions/fts3/Makefile.in
@@ -43,13 +43,9 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= fts3tok
 
 PARALLEL_DIRS	= public src
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS	= build
-endif
-
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/fts3/build/Makefile.in
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Japan.
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Makoto Kato <m_kato@ga2.so-net.ne.jp>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= fts3tok
-LIBRARY_NAME	= fts3tok
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsFts3TokenizerModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-CPPSRCS		= nsFts3TokenizerFactory.cpp
-
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-SHARED_LIBRARY_LIBS = \
-		../src/$(LIB_PREFIX)fts3tok_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/fts3/build/nsFts3TokenizerFactory.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Japan.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Makoto Kato <m_kato@ga2.so-net.ne.jp>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mozilla/ModuleUtils.h"
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
-
-#include "nsIFactory.h"
-#include "nsIServiceManager.h"
-#include "nsIModule.h"
-
-#include "nsFts3TokenizerCID.h"
-
-#include "nsFts3Tokenizer.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsFts3Tokenizer)
-
-NS_DEFINE_NAMED_CID(NS_FTS3TOKENIZER_CID);
-
-const mozilla::Module::CIDEntry kFts3TokenizerCIDs[] = {
-  { &kNS_FTS3TOKENIZER_CID, false, NULL, nsFts3TokenizerConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kFts3TokenizerContracts[] = {
-  { NS_FTS3TOKENIZER_CONTRACTID, &kNS_FTS3TOKENIZER_CID },
-  { NULL }
-};
-
-/////////////////////////////////////////////////////////////////////////////
-//
-/////////////////////////////////////////////////////////////////////////////
-
-static const mozilla::Module kFts3TokenizerModule = {
-    mozilla::Module::kVersion,
-    kFts3TokenizerCIDs,
-    kFts3TokenizerContracts
-};
-
-NSMODULE_DEFN(fts3tokenizer) = &kFts3TokenizerModule;
--- a/mailnews/extensions/mailviews/Makefile.in
+++ b/mailnews/extensions/mailviews/Makefile.in
@@ -41,13 +41,9 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mailview
 
 PARALLEL_DIRS	= public src content
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS = build
-endif
-
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/mailviews/build/Makefile.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= mailview
-LIBRARY_NAME	= mailview
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsMsgMailViewModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-CPPSRCS		= nsMsgMailViewsFactory.cpp
-
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-SHARED_LIBRARY_LIBS = \
-		../src/$(LIB_PREFIX)mailview_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/mailviews/build/nsMsgMailViewsFactory.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Scott MacGregor <mscott@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mozilla/ModuleUtils.h"
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
-
-#include "nsIFactory.h"
-#include "nsIServiceManager.h"
-#include "nsIModule.h"
-
-#include "nsMsgMailViewsCID.h"
-
-/* Include all of the interfaces our factory can generate components for */
-#include "nsMsgMailViewList.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgMailViewList)
-
-NS_DEFINE_NAMED_CID(NS_MSGMAILVIEWLIST_CID);
-
-const mozilla::Module::CIDEntry kMsgMailViewListCIDs[] = {
-  { &kNS_MSGMAILVIEWLIST_CID, false, NULL, nsMsgMailViewListConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kMsgMailViewListContracts[] = {
-  { NS_MSGMAILVIEWLIST_CONTRACTID, &kNS_MSGMAILVIEWLIST_CID },
-  { NULL }
-};
-
-/////////////////////////////////////////////////////////////////////////////
-//
-/////////////////////////////////////////////////////////////////////////////
-
-static const mozilla::Module kMsgMailViewListModule = {
-    mozilla::Module::kVersion,
-    kMsgMailViewListCIDs,
-    kMsgMailViewListContracts
-};
-
-NSMODULE_DEFN(msgmailviewlist) = &kMsgMailViewListModule;
--- a/mailnews/extensions/mdn/Makefile.in
+++ b/mailnews/extensions/mdn/Makefile.in
@@ -41,20 +41,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgmdn
 
 DIRS		= src
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
-endif
-
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
deleted file mode 100644
--- a/mailnews/extensions/mdn/build/Makefile.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= msgmdn
-LIBRARY_NAME	= msgmdn
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsMsgMdnModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-CPPSRCS		= nsMsgMdnFactory.cpp
-
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-SHARED_LIBRARY_LIBS = \
-		../src/$(LIB_PREFIX)msgmdn_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/mdn/build/nsMsgMdnFactory.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Jeff Tsai <jt95070@netscape.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mozilla/ModuleUtils.h"
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
-
-#include "nsIFactory.h"
-#include "nsIServiceManager.h"
-#include "nsIModule.h"
-
-#include "nsMsgMdnCID.h"
-
-/* Include all of the interfaces our factory can generate components for */
-#include "nsMsgMdnGenerator.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgMdnGenerator)
-
-NS_DEFINE_NAMED_CID(NS_MSGMDNGENERATOR_CID);
-
-const mozilla::Module::CIDEntry kMdnGeneratorCIDs[] = {
-  { &kNS_MSGMDNGENERATOR_CID, false, NULL, nsMsgMdnGeneratorConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kMdnGeneratorContracts[] = {
-  { NS_MSGMDNGENERATOR_CONTRACTID, &kNS_MSGMDNGENERATOR_CID },
-  { NULL }
-};
-
-/////////////////////////////////////////////////////////////////////////////
-//
-/////////////////////////////////////////////////////////////////////////////
-
-static const mozilla::Module kMdnGeneratorModule = {
-    mozilla::Module::kVersion,
-    kMdnGeneratorCIDs,
-    kMdnGeneratorContracts
-};
-
-NSMODULE_DEFN(mdngenerator) = &kMdnGeneratorModule;
-
--- a/mailnews/extensions/smime/build/Makefile.in
+++ b/mailnews/extensions/smime/build/Makefile.in
@@ -48,34 +48,24 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgSMIMEModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 LIBXUL_LIBRARY = 1
 
 
-ifndef MOZ_STATIC_MAIL_BUILD
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-endif
-
 CPPSRCS		= nsMsgSMIMEFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)msgsmime_s.$(LIB_SUFFIX) \
 		$(NULL)
 
-ifndef MOZ_STATIC_MAIL_BUILD
-SHARED_LIBRARY_LIBS + = ../../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
-endif
-
 ifdef MOZILLA_INTERNAL_API
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 else
 EXTRA_DSO_LDOPTS = \
--- a/mailnews/imap/Makefile.in
+++ b/mailnews/imap/Makefile.in
@@ -41,18 +41,14 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgimap
 
 PARALLEL_DIRS	= public src
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS = build
-endif
-
 ifdef ENABLE_TESTS
 TOOL_DIRS += test
 endif
 
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100644
--- a/mailnews/imap/build/Makefile.in
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= msgimap
-LIBRARY_NAME	= msgimap
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= IMAP_factory
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
-
-EXTRA_DSO_LIBS	= msgbaseutil
-
-CPPSRCS		= nsImapFactory.cpp
-
-SHARED_LIBRARY_LIBS = \
-		../src/$(LIB_PREFIX)msgimap_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/imap/build/nsImapFactory.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Pierre Phaneuf <pp@ludusdesign.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "msgCore.h" // for pre-compiled headers...
-#include "nsCOMPtr.h"
-#include "mozilla/ModuleUtils.h"
-
-#include "nsIMAPHostSessionList.h"
-#include "nsImapIncomingServer.h"
-#include "nsImapService.h"
-#include "nsImapMailFolder.h"
-#include "nsImapUrl.h"
-#include "nsImapProtocol.h"
-#include "nsMsgImapCID.h"
-#include "nsCURILoader.h"
-#include "nsAutoSyncManager.h"
-
-// private factory declarations for each component we know how to produce
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapUrl)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapProtocol)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsIMAPHostSessionList, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapIncomingServer)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapMailFolder)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapMockChannel)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoSyncManager)
-
-NS_DEFINE_NAMED_CID(NS_IMAPURL_CID);
-NS_DEFINE_NAMED_CID(NS_IMAPPROTOCOL_CID);
-NS_DEFINE_NAMED_CID(NS_IMAPMOCKCHANNEL_CID);
-NS_DEFINE_NAMED_CID(NS_IIMAPHOSTSESSIONLIST_CID);
-NS_DEFINE_NAMED_CID(NS_IMAPINCOMINGSERVER_CID);
-NS_DEFINE_NAMED_CID(NS_IMAPRESOURCE_CID);
-NS_DEFINE_NAMED_CID(NS_IMAPSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_AUTOSYNCMANAGER_CID);
-
-const mozilla::Module::CIDEntry kIMAPCIDs[] = {
-  { &kNS_IMAPURL_CID, false, NULL, nsImapUrlConstructor },
-  { &kNS_IMAPPROTOCOL_CID, false, nsnull, nsImapProtocolConstructor },
-  { &kNS_IMAPMOCKCHANNEL_CID, false, nsnull, nsImapMockChannelConstructor },
-  { &kNS_IIMAPHOSTSESSIONLIST_CID, false, nsnull, nsIMAPHostSessionListConstructor },
-  { &kNS_IMAPINCOMINGSERVER_CID, false, nsnull, nsImapIncomingServerConstructor },
-  { &kNS_IMAPRESOURCE_CID, false, nsnull, nsImapMailFolderConstructor },
-  { &kNS_IMAPSERVICE_CID, false, nsnull, nsImapServiceConstructor },
-  { &kNS_AUTOSYNCMANAGER_CID, false, nsnull, nsAutoSyncManagerConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kIMAPContracts[] = {
-  { NS_IMAPINCOMINGSERVER_CONTRACTID, &kNS_IMAPINCOMINGSERVER_CID },
-  { NS_RDF_RESOURCE_FACTORY_CONTRACTID_PREFIX "imap", &kNS_IMAPRESOURCE_CID },
-  { "@mozilla.org/messenger/messageservice;1?type=imap-message", &kNS_IMAPSERVICE_CID },
-  { "@mozilla.org/messenger/messageservice;1?type=imap", &kNS_IMAPSERVICE_CID },
-  { NS_IMAPSERVICE_CONTRACTID, &kNS_IMAPSERVICE_CID },
-  { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "imap", &kNS_IMAPSERVICE_CID },
-  { NS_IMAPPROTOCOLINFO_CONTRACTID, &kNS_IMAPSERVICE_CID },
-  { NS_CONTENT_HANDLER_CONTRACTID_PREFIX "x-application-imapfolder", &kNS_IMAPSERVICE_CID },
-  { NS_AUTOSYNCMANAGER_CONTRACTID, &kNS_AUTOSYNCMANAGER_CID },
-  { NULL }
-};
-
-/////////////////////////////////////////////////////////////////////////////
-//
-/////////////////////////////////////////////////////////////////////////////
-
-static const mozilla::Module kIMAPModule = {
-    mozilla::Module::kVersion,
-    kIMAPCIDs,
-    kIMAPContracts
-};
-
-NSMODULE_DEFN(imap) = &kIMAPModule;
--- a/mailnews/imap/test/Makefile.in
+++ b/mailnews/imap/test/Makefile.in
@@ -70,23 +70,13 @@ LOCAL_INCLUDES = \
 		$(NULL)
 
 ifndef MOZILLA_INTERNAL_API
 LIBS += $(XPCOM_GLUE_LDOPTS)
 endif
 
 LIBS += 	\
 		../src/$(LIB_PREFIX)msgimap_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZ_STATIC_MAIL_BUILD
-LIBS +=		\
 		../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) \
-		$(NULL)
-else
-LIBS +=		$(call EXPAND_LIBNAME_PATH,msgbaseutil,../../base/util)
-endif
-
-LIBS +=		\
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(ZLIB_LIBS) \
 		$(NULL)
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -95,21 +95,17 @@ LOCAL_INCLUDES += -I$(srcdir)/../eudora/
 ifndef GNU_CC
 LOCAL_INCLUDES += -I$(srcdir)/../oexpress \
 	-I$(srcdir)/../outlook/src \
 	-I$(srcdir)/../winlivemail  \
 	$(NULL)
 endif
 endif
 
-ifdef MOZ_STATIC_MAIL_BUILD
 EXTRA_DSO_LDOPTS += ../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
-else
-EXTRA_DSO_LIBS = msgbaseutil
-endif # MOZ_STATIC_MAIL_BUILD
 
 ifdef MOZILLA_INTERNAL_API
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZDEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
 	$(MOZ_COMPONENT_LIBS) \
--- a/mailnews/local/Makefile.in
+++ b/mailnews/local/Makefile.in
@@ -45,14 +45,10 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= msglocal
 
 PARALLEL_DIRS	= public src
 
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += test
 endif
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS = build
-endif
-
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100644
--- a/mailnews/local/build/Makefile.in
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= msglocal
-LIBRARY_NAME	= msglocal
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= local_mail_services
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-CPPSRCS		= nsMsgLocalFactory.cpp
-
-SHARED_LIBRARY_LIBS = \
-		../src/$(LIB_PREFIX)msglocal_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_MOVEMAIL
-DEFINES	+= -DHAVE_MOVEMAIL
-endif
deleted file mode 100644
--- a/mailnews/local/build/nsMsgLocalFactory.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Pierre Phaneuf <pp@ludusdesign.com>
- *   Adam D. Moss <adam@gimp.org>
- *   Seth Spitzer <sspitzer@mozilla.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "msgCore.h" // for pre-compiled headers...
-#include "mozilla/ModuleUtils.h"
-#include "nsMsgLocalCID.h"
-
-// include files for components this factory creates...
-#include "nsMailboxUrl.h"
-#include "nsPop3URL.h"
-#include "nsMailboxService.h"
-#include "nsLocalMailFolder.h"
-#include "nsParseMailbox.h"
-#include "nsPop3Service.h"
-#ifdef HAVE_MOVEMAIL
-#include "nsMovemailService.h"
-#include "nsMovemailIncomingServer.h"
-#endif /* HAVE_MOVEMAIL */
-#include "nsNoneService.h"
-#include "nsPop3IncomingServer.h"
-#include "nsNoIncomingServer.h"
-#include "nsRssService.h"
-#include "nsRssIncomingServer.h"
-#include "nsCOMPtr.h"
-
-// private factory declarations for each component we know how to produce
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMailboxUrl)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsPop3URL)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgMailboxParser)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMailboxService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsPop3Service)
-#ifdef HAVE_MOVEMAIL
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMovemailService)
-#endif /* HAVE_MOVEMAIL */
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNoneService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgLocalMailFolder)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsParseMailMessageState)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsPop3IncomingServer)
-#ifdef HAVE_MOVEMAIL
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMovemailIncomingServer)
-#endif /* HAVE_MOVEMAIL */
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNoIncomingServer)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsRssService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsRssIncomingServer)
-
-NS_DEFINE_NAMED_CID(NS_MAILBOXURL_CID);
-NS_DEFINE_NAMED_CID(NS_MAILBOXSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_MAILBOXPARSER_CID);
-NS_DEFINE_NAMED_CID(NS_POP3URL_CID);
-NS_DEFINE_NAMED_CID(NS_POP3SERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_NONESERVICE_CID);
-#ifdef HAVE_MOVEMAIL
-NS_DEFINE_NAMED_CID(NS_MOVEMAILSERVICE_CID);
-#endif /* HAVE_MOVEMAIL */
-NS_DEFINE_NAMED_CID(NS_LOCALMAILFOLDERRESOURCE_CID);
-NS_DEFINE_NAMED_CID(NS_POP3INCOMINGSERVER_CID);
-#ifdef HAVE_MOVEMAIL
-NS_DEFINE_NAMED_CID(NS_MOVEMAILINCOMINGSERVER_CID);
-#endif /* HAVE_MOVEMAIL */
-NS_DEFINE_NAMED_CID(NS_NOINCOMINGSERVER_CID);
-NS_DEFINE_NAMED_CID(NS_PARSEMAILMSGSTATE_CID);
-NS_DEFINE_NAMED_CID(NS_RSSSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_RSSINCOMINGSERVER_CID);
-
-const mozilla::Module::CIDEntry kMsgLocalCIDs[] = {
-  { &kNS_MAILBOXURL_CID, false, NULL, nsMailboxUrlConstructor },
-  { &kNS_MAILBOXSERVICE_CID, false, NULL, nsMailboxServiceConstructor },
-  { &kNS_MAILBOXPARSER_CID, false, NULL, nsMsgMailboxParserConstructor },
-  { &kNS_POP3URL_CID, false, NULL, nsPop3URLConstructor },
-  { &kNS_POP3SERVICE_CID, false, NULL, nsPop3ServiceConstructor },
-  { &kNS_NONESERVICE_CID, false, NULL, nsNoneServiceConstructor },
-#ifdef HAVE_MOVEMAIL
-  { &kNS_MOVEMAILSERVICE_CID, false, NULL, nsMovemailServiceConstructor },
-#endif /* HAVE_MOVEMAIL */
-  { &kNS_LOCALMAILFOLDERRESOURCE_CID, false, NULL, nsMsgLocalMailFolderConstructor },
-  { &kNS_POP3INCOMINGSERVER_CID, false, NULL, nsPop3IncomingServerConstructor },
-#ifdef HAVE_MOVEMAIL
-  { &kNS_MOVEMAILINCOMINGSERVER_CID, false, NULL, nsMovemailIncomingServerConstructor },
-#endif /* HAVE_MOVEMAIL */
-  { &kNS_NOINCOMINGSERVER_CID, false, NULL, nsNoIncomingServerConstructor },
-  { &kNS_PARSEMAILMSGSTATE_CID, false, NULL, nsParseMailMessageStateConstructor },
-  { &kNS_RSSSERVICE_CID, false, NULL, nsRssServiceConstructor },
-  { &kNS_RSSINCOMINGSERVER_CID, false, NULL, nsRssIncomingServerConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kMsgLocalContracts[] = {
-  { NS_MAILBOXURL_CONTRACTID, &kNS_MAILBOXURL_CID },
-  { NS_MAILBOXSERVICE_CONTRACTID1, &kNS_MAILBOXSERVICE_CID },
-  { NS_MAILBOXSERVICE_CONTRACTID2, &kNS_MAILBOXSERVICE_CID },
-  { NS_MAILBOXSERVICE_CONTRACTID3, &kNS_MAILBOXSERVICE_CID },
-  { NS_MAILBOXSERVICE_CONTRACTID4, &kNS_MAILBOXSERVICE_CID },
-  { NS_MAILBOXPARSER_CONTRACTID, &kNS_MAILBOXPARSER_CID },
-  { NS_POP3URL_CONTRACTID, &kNS_POP3URL_CID },
-  { NS_POP3SERVICE_CONTRACTID1, &kNS_POP3SERVICE_CID },
-  { NS_POP3SERVICE_CONTRACTID2, &kNS_POP3SERVICE_CID },
-  { NS_NONESERVICE_CONTRACTID, &kNS_NONESERVICE_CID },
-#ifdef HAVE_MOVEMAIL
-  { NS_MOVEMAILSERVICE_CONTRACTID, &kNS_MOVEMAILSERVICE_CID },
-#endif /* HAVE_MOVEMAIL */
-  { NS_POP3PROTOCOLINFO_CONTRACTID, &kNS_POP3SERVICE_CID },
-  { NS_NONEPROTOCOLINFO_CONTRACTID, &kNS_NONESERVICE_CID },
-#ifdef HAVE_MOVEMAIL
-  { NS_MOVEMAILPROTOCOLINFO_CONTRACTID, &kNS_MOVEMAILSERVICE_CID },
-#endif /* HAVE_MOVEMAIL */
-  { NS_LOCALMAILFOLDERRESOURCE_CONTRACTID, &kNS_LOCALMAILFOLDERRESOURCE_CID },
-  { NS_POP3INCOMINGSERVER_CONTRACTID, &kNS_POP3INCOMINGSERVER_CID },
-#ifdef HAVE_MOVEMAIL
-  { NS_MOVEMAILINCOMINGSERVER_CONTRACTID, &kNS_MOVEMAILINCOMINGSERVER_CID },
-#endif /* HAVE_MOVEMAIL */
-  { NS_NOINCOMINGSERVER_CONTRACTID, &kNS_NOINCOMINGSERVER_CID },
-  { NS_PARSEMAILMSGSTATE_CONTRACTID, &kNS_PARSEMAILMSGSTATE_CID },
-  { NS_RSSSERVICE_CONTRACTID, &kNS_RSSSERVICE_CID },
-  { NS_RSSPROTOCOLINFO_CONTRACTID, &kNS_RSSSERVICE_CID },
-  { NS_RSSINCOMINGSERVER_CONTRACTID, &kNS_RSSINCOMINGSERVER_CID },
-  { NULL }
-};
-
-static const mozilla::Module kMsgLocalModule = {
-    mozilla::Module::kVersion,
-    kMsgLocalCIDs,
-    kMsgLocalContracts,
-};
-
-NSMODULE_DEFN(msglocal) = &kMsgLocalModule;
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -59,21 +59,17 @@ CPPSRCS		= \
 		msgMapiImp.cpp \
 		msgMapiMain.cpp \
 		msgMapiSupport.cpp \
 		Registry.cpp \
 		$(NULL)
 
 LOBJS		= ../build/msgMapi_i.$(OBJ_SUFFIX)
 
-ifndef MOZ_STATIC_MAIL_BUILD
-EXTRA_DSO_LIBS	= msgbaseutil
-else
 SHARED_LIBRARY_LIBS = ../../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
-endif
 
 ifdef MOZILLA_INTERNAL_API
 EXTRA_DSO_LDOPTS= \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/mailnews/mime/Makefile.in
+++ b/mailnews/mime/Makefile.in
@@ -45,14 +45,10 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= mime
 
 PARALLEL_DIRS	= public src emitters cthandlers
 
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += test
 endif
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS = build
-endif
-
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100644
--- a/mailnews/mime/build/Makefile.in
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= mime
-LIBRARY_NAME	= mime
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= mime_services
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-CPPSRCS			= nsMimeModule.cpp
-
-SHARED_LIBRARY_LIBS = \
-                ../src/$(LIB_PREFIX)mime_s.$(LIB_SUFFIX) \
-                $(NULL)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-	        $(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-                $(MOZ_COMPONENT_LIBS) \
-                $(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/mime/build/nsMimeModule.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Pierre Phaneuf <pp@ludusdesign.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mozilla/ModuleUtils.h"
-#include "nsMsgMimeCID.h"
-#include "nsCOMPtr.h"
-
-// include files for components this factory creates...
-#include "nsStreamConverter.h"
-#include "nsMimeObjectClassAccess.h"
-#include "nsMimeConverter.h"
-#include "nsMsgHeaderParser.h"
-#include "nsMimeHeaders.h"
-
-// private factory declarations for each component we know how to produce
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimeObjectClassAccess)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimeConverter)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsStreamConverter)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgHeaderParser)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimeHeaders)
-
-NS_DEFINE_NAMED_CID(NS_MIME_OBJECT_CLASS_ACCESS_CID);
-NS_DEFINE_NAMED_CID(NS_MIME_CONVERTER_CID);
-NS_DEFINE_NAMED_CID(NS_MSGHEADERPARSER_CID);
-NS_DEFINE_NAMED_CID(NS_MAILNEWS_MIME_STREAM_CONVERTER_CID);
-NS_DEFINE_NAMED_CID(NS_IMIMEHEADERS_CID);
-
-const mozilla::Module::CIDEntry kMimeCIDs[] = {
-  { &kNS_MIME_OBJECT_CLASS_ACCESS_CID, false, NULL, nsMimeObjectClassAccessConstructor },
-  { &kNS_MIME_CONVERTER_CID, false, NULL, nsMimeConverterConstructor },
-  { &kNS_MSGHEADERPARSER_CID, false, NULL, nsMsgHeaderParserConstructor },
-  { &kNS_MAILNEWS_MIME_STREAM_CONVERTER_CID, false, NULL, nsStreamConverterConstructor },
-  { &kNS_IMIMEHEADERS_CID, false, NULL, nsMimeHeadersConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kMimeContracts[] = {
-  { NS_MIME_OBJECT_CONTRACTID, &kNS_MIME_OBJECT_CLASS_ACCESS_CID },
-  { NS_MIME_CONVERTER_CONTRACTID, &kNS_MIME_CONVERTER_CID },
-  { NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID, &kNS_MSGHEADERPARSER_CID },
-  { NS_MAILNEWS_MIME_STREAM_CONVERTER_CONTRACTID, &kNS_MAILNEWS_MIME_STREAM_CONVERTER_CID },
-  { NS_MAILNEWS_MIME_STREAM_CONVERTER_CONTRACTID1, &kNS_MAILNEWS_MIME_STREAM_CONVERTER_CID },
-  { NS_MAILNEWS_MIME_STREAM_CONVERTER_CONTRACTID2, &kNS_MAILNEWS_MIME_STREAM_CONVERTER_CID },
-  { NS_IMIMEHEADERS_CONTRACTID, &kNS_IMIMEHEADERS_CID },
-  { NULL }
-};
-
-static const mozilla::Module kMimeModule = {
-    mozilla::Module::kVersion,
-    kMimeCIDs,
-    kMimeContracts
-};
-
-NSMODULE_DEFN(mime) = &kMimeModule;
--- a/mailnews/mime/cthandlers/Makefile.in
+++ b/mailnews/mime/cthandlers/Makefile.in
@@ -41,23 +41,17 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_PSM
 BUILD_SMIME=1
 endif
 
-ifdef MOZ_STATIC_MAIL_BUILD
 PARALLEL_DIRS += glue vcard
-else
-# In a shared build, vcard depends on glue, so we must force that to be built
-# first.
-DIRS += glue vcard
-endif
 
 ifndef BUILD_SMIME
 # smimestub always depends on glue, so always build that afterwards
 DIRS += smimestub
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mailnews/mime/cthandlers/vcard/Makefile.in
@@ -38,63 +38,23 @@
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= vcard
+LIBRARY_NAME = vcard_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-ifndef MOZ_STATIC_MAIL_BUILD
-LIBRARY_NAME	= vcard
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsVCardModule
-else
-LIBRARY_NAME = vcard_s
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-MAPFILE		= vcard.map
-DEFFILE		= $(win_srcdir)/vcard.def
-endif
-
 LOCAL_INCLUDES = -I$(srcdir)/../glue
 
 CPPSRCS		= \
 		mimevcrd.cpp \
 		$(NULL)
 
-ifndef MOZ_STATIC_MAIL_BUILD
-
-CPPSRCS += nsVCardFactory.cpp
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		../glue/$(LIB_PREFIX)mimecthglue_s.$(LIB_SUFFIX) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	../glue/$(LIB_PREFIX)mimecthglue_s.$(LIB_SUFFIX) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-else
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
-endif
-
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/mime/cthandlers/vcard/mimect-vcard.def
+++ /dev/null
@@ -1,41 +0,0 @@
-; ***** BEGIN LICENSE BLOCK *****
-; Version: MPL 1.1/GPL 2.0/LGPL 2.1
-;
-; The contents of this file are subject to the Mozilla Public License Version
-; 1.1 (the "License"); you may not use this file except in compliance with
-; the License. You may obtain a copy of the License at
-; http://www.mozilla.org/MPL/
-;
-; Software distributed under the License is distributed on an "AS IS" basis,
-; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-; for the specific language governing rights and limitations under the
-; License.
-;
-; The Original Code is mozilla.org code.
-;
-; The Initial Developer of the Original Code is
-; Netscape Communications Corporation.
-; Portions created by the Initial Developer are Copyright (C) 1998
-; the Initial Developer. All Rights Reserved.
-;
-; Contributor(s):
-;
-; Alternatively, the contents of this file may be used under the terms of
-; either of the GNU General Public License Version 2 or later (the "GPL"),
-; or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-; in which case the provisions of the GPL or the LGPL are applicable instead
-; of those above. If you wish to allow use of your version of this file only
-; under the terms of either the GPL or the LGPL, and not to allow others to
-; use your version of this file under the terms of the MPL, indicate your
-; decision by deleting the provisions above and replace them with the notice
-; and other provisions required by the GPL or the LGPL. If you do not delete
-; the provisions above, a recipient may use your version of this file under
-; the terms of any one of the MPL, the GPL or the LGPL.
-;
-; ***** END LICENSE BLOCK *****
-
-LIBRARY mimect-vcard.dll
-
-EXPORTS	
-  MIME_GetContentType
-  MIME_CreateContentTypeHandlerClass
\ No newline at end of file
deleted file mode 100644
--- a/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mozilla/ModuleUtils.h"
-
-/* Include all of the interfaces our factory can generate components for */
-#include "nsMimeContentTypeHandler.h"
-
-/*
- * These functions are the public interface for this content type
- * handler and will be called in by the mime component.
- */
-#define      VCARD_CONTENT_TYPE  "text/x-vcard"
-
-NS_DEFINE_NAMED_CID(NS_VCARD_CONTENT_TYPE_HANDLER_CID);
-
-////////////////////////////////////////////////////////////////////////
-// Define the contructor function for the CID
-//
-// What this does is defines a function nsMimeContentTypeHandlerConstructor
-// which we will specific in the nsModuleComponentInfo table. This function will
-// be used by the generic factory to create an instance.
-//
-// NOTE: This creates an instance by using the default constructor
-//
-//NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimeContentTypeHandler) 
-extern "C" MimeObjectClass *
-MIME_VCardCreateContentTypeHandlerClass(const char *content_type, 
-                                        contentTypeHandlerInitStruct *initStruct);
-
-static nsresult
-nsVCardMimeContentTypeHandlerConstructor(nsISupports *aOuter,
-                                         REFNSIID aIID,
-                                         void **aResult)
-{
-  nsresult rv;
-  nsMimeContentTypeHandler *inst = nsnull;
-
-  if (NULL == aResult) {
-    rv = NS_ERROR_NULL_POINTER;
-    return rv;
-  }
-  *aResult = NULL;
-  if (NULL != aOuter) {
-    rv = NS_ERROR_NO_AGGREGATION;
-    return rv;
-  }
-  inst = new nsMimeContentTypeHandler(VCARD_CONTENT_TYPE, 
-                                      &MIME_VCardCreateContentTypeHandlerClass);
-  if (inst == NULL) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  NS_ADDREF(inst);
-  rv = inst->QueryInterface(aIID,aResult);
-  NS_RELEASE(inst);
-
-  return rv;
-}
-
-const mozilla::Module::CIDEntry kVCardCIDs[] = {
-  { &kNS_VCARD_CONTENT_TYPE_HANDLER_CID, false, NULL, nsVCardMimeContentTypeHandlerConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kVCardContracts[] = {
-  { "@mozilla.org/mimecth;1?type=text/x-vcard", &kNS_VCARD_CONTENT_TYPE_HANDLER_CID },
-  { NULL }
-};
-
-static const mozilla::Module kVCardModule = {
-    mozilla::Module::kVersion,
-    kVCardCIDs,
-    kVCardContracts,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
-
-NSMODULE_DEFN(vcard) = &kVCardModule;
-
deleted file mode 100644
--- a/mailnews/mime/cthandlers/vcard/vcard.def
+++ /dev/null
@@ -1,39 +0,0 @@
-; ***** BEGIN LICENSE BLOCK *****
-; Version: MPL 1.1/GPL 2.0/LGPL 2.1
-;
-; The contents of this file are subject to the Mozilla Public License Version
-; 1.1 (the "License"); you may not use this file except in compliance with
-; the License. You may obtain a copy of the License at
-; http://www.mozilla.org/MPL/
-;
-; Software distributed under the License is distributed on an "AS IS" basis,
-; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-; for the specific language governing rights and limitations under the
-; License.
-;
-; The Original Code is mozilla.org code.
-;
-; The Initial Developer of the Original Code is
-; Netscape Communications Corporation.
-; Portions created by the Initial Developer are Copyright (C) 1998
-; the Initial Developer. All Rights Reserved.
-;
-; Contributor(s):
-;
-; Alternatively, the contents of this file may be used under the terms of
-; either of the GNU General Public License Version 2 or later (the "GPL"),
-; or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-; in which case the provisions of the GPL or the LGPL are applicable instead
-; of those above. If you wish to allow use of your version of this file only
-; under the terms of either the GPL or the LGPL, and not to allow others to
-; use your version of this file under the terms of the MPL, indicate your
-; decision by deleting the provisions above and replace them with the notice
-; and other provisions required by the GPL or the LGPL. If you do not delete
-; the provisions above, a recipient may use your version of this file under
-; the terms of any one of the MPL, the GPL or the LGPL.
-;
-; ***** END LICENSE BLOCK *****
-
-LIBRARY vcard.dll
-
-EXPORTS	
--- a/mailnews/mime/emitters/Makefile.in
+++ b/mailnews/mime/emitters/Makefile.in
@@ -40,14 +40,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mimemitter
 DIRS		= src
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
-endif
-
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100644
--- a/mailnews/mime/emitters/build/Makefile.in
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= mimeemitter
-LIBRARY_NAME	= mimeemitter
-EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= mimeemit
-IS_COMPONENT	= 1
-MODULE_NAME	= nsMimeEmitterModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-
-EXTRA_DSO_LIBS = msgbaseutil
-
-CPPSRCS		= nsEmitterFactory.cpp
-
-SHARED_LIBRARY_LIBS = \
-		../src/$(LIB_PREFIX)emitterutil_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIRS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(EXTRA_DSO_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/mime/emitters/build/nsEmitterFactory.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "msgCore.h"
-#include "nsCOMPtr.h"
-#include "pratom.h"
-#include "nsServiceManagerUtils.h"
-#include "mozilla/ModuleUtils.h"
-
-/* Include all of the interfaces our factory can generate components for */
-#include "nsMimeEmitterCID.h"
-#include "nsIMimeEmitter.h"
-#include "nsMimeHtmlEmitter.h"
-#include "nsMimeRawEmitter.h"
-#include "nsMimeXmlEmitter.h"
-#include "nsMimePlainEmitter.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimeRawEmitter)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimeXmlEmitter)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimePlainEmitter)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMimeHtmlDisplayEmitter, Init)
-
-NS_DEFINE_NAMED_CID(NS_HTML_MIME_EMITTER_CID);
-NS_DEFINE_NAMED_CID(NS_XML_MIME_EMITTER_CID);
-NS_DEFINE_NAMED_CID(NS_PLAIN_MIME_EMITTER_CID);
-NS_DEFINE_NAMED_CID(NS_RAW_MIME_EMITTER_CID);
-
-static const mozilla::Module::CategoryEntry kMimeEmitterCategories[] = {
-  { "mime-emitter", NS_HTML_MIME_EMITTER_CONTRACTID, NS_HTML_MIME_EMITTER_CONTRACTID },
-  { "mime-emitter", NS_XML_MIME_EMITTER_CONTRACTID, NS_XML_MIME_EMITTER_CONTRACTID },
-  { "mime-emitter", NS_PLAIN_MIME_EMITTER_CONTRACTID, NS_PLAIN_MIME_EMITTER_CONTRACTID },
-  { "mime-emitter", NS_RAW_MIME_EMITTER_CONTRACTID, NS_RAW_MIME_EMITTER_CONTRACTID },
-  { NULL }
-};
-
-const mozilla::Module::CIDEntry kMimeEmitterCIDs[] = {
-  { &kNS_HTML_MIME_EMITTER_CID, false, NULL, nsMimeHtmlDisplayEmitterConstructor },
-  { &kNS_XML_MIME_EMITTER_CID, false, NULL, nsMimeXmlEmitterConstructor },
-  { &kNS_PLAIN_MIME_EMITTER_CID, false, NULL, nsMimePlainEmitterConstructor },
-  { &kNS_RAW_MIME_EMITTER_CID, false, NULL, nsMimeRawEmitterConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kMimeEmitterContracts[] = {
-  { NS_HTML_MIME_EMITTER_CONTRACTID, &kNS_HTML_MIME_EMITTER_CID },
-  { NS_XML_MIME_EMITTER_CONTRACTID, &kNS_XML_MIME_EMITTER_CID },
-  { NS_PLAIN_MIME_EMITTER_CONTRACTID, &kNS_PLAIN_MIME_EMITTER_CID },
-  { NS_RAW_MIME_EMITTER_CONTRACTID, &kNS_RAW_MIME_EMITTER_CID },
-  { NULL }
-};
-
-static const mozilla::Module kMimeEmitterModule = {
-    mozilla::Module::kVersion,
-    kMimeEmitterCIDs,
-    kMimeEmitterContracts,
-    kMimeEmitterCategories
-};
-
-NSMODULE_DEFN(mimeemitter) = &kMimeEmitterModule;
--- a/mailnews/news/Makefile.in
+++ b/mailnews/news/Makefile.in
@@ -44,14 +44,10 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS	= public src
 
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += test
 endif
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS = build
-endif
-
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100644
--- a/mailnews/news/build/Makefile.in
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= msgnews
-LIBRARY_NAME	= msgnews
-EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsMsgNewsModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
-
-CPPSRCS		= nsMsgNewsFactory.cpp
-
-LOCAL_INCLUDES += -I$(srcdir)/../src
-
-SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgnews_s.$(LIB_SUFFIX)
-
-EXTRA_DSO_LIBS += msgbaseutil
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/news/build/nsMsgNewsFactory.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.h"
-#include "mozilla/ModuleUtils.h"
-
-#include "msgCore.h"
-#include "pratom.h"
-#include "nsICategoryManager.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-
-#include "nsNewsFolder.h"
-#include "nsMsgNewsCID.h"
-
-/* Include all of the interfaces our factory can generate components for */
-#include "nsNntpUrl.h"
-#include "nsNntpService.h"
-#include "nsNntpIncomingServer.h"
-#include "nsNNTPNewsgroupPost.h"
-#include "nsNNTPNewsgroupList.h"
-#include "nsNNTPArticleList.h"
-#include "nsNewsDownloadDialogArgs.h"
-#include "nsCURILoader.h"
-#include "nsServiceManagerUtils.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNntpUrl)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNntpService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNntpIncomingServer)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNNTPArticleList)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNNTPNewsgroupPost)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNNTPNewsgroupList)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgNewsFolder)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNewsDownloadDialogArgs)
-
-NS_DEFINE_NAMED_CID(NS_NNTPSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_NNTPURL_CID);
-NS_DEFINE_NAMED_CID(NS_NEWSFOLDERRESOURCE_CID);
-NS_DEFINE_NAMED_CID(NS_NNTPINCOMINGSERVER_CID);
-NS_DEFINE_NAMED_CID(NS_NNTPNEWSGROUPPOST_CID);
-NS_DEFINE_NAMED_CID(NS_NNTPNEWSGROUPLIST_CID);
-NS_DEFINE_NAMED_CID(NS_NNTPARTICLELIST_CID);
-NS_DEFINE_NAMED_CID(NS_NEWSDOWNLOADDIALOGARGS_CID);
-
-static const mozilla::Module::CategoryEntry kMsgNewsCategories[] = {
-  { "command-line-handler", "m-news", NS_NEWSSTARTUPHANDLER_CONTRACTID },
-  { NULL }
-};
-
-const mozilla::Module::CIDEntry kMsgNewsCIDs[] = {
-  { &kNS_NNTPURL_CID, false, NULL, nsNntpUrlConstructor },
-  { &kNS_NNTPSERVICE_CID, false, NULL, nsNntpServiceConstructor },
-  { &kNS_NEWSFOLDERRESOURCE_CID, false, NULL, nsMsgNewsFolderConstructor },
-  { &kNS_NNTPINCOMINGSERVER_CID, false, NULL, nsNntpIncomingServerConstructor },
-  { &kNS_NNTPNEWSGROUPPOST_CID, false, NULL, nsNNTPNewsgroupPostConstructor },
-  { &kNS_NNTPNEWSGROUPLIST_CID, false, NULL, nsNNTPNewsgroupListConstructor },
-  { &kNS_NNTPARTICLELIST_CID, false, NULL, nsNNTPArticleListConstructor },
-  { &kNS_NEWSDOWNLOADDIALOGARGS_CID, false, NULL, nsNewsDownloadDialogArgsConstructor },
-  { NULL }
-};
-
-const mozilla::Module::ContractIDEntry kMsgNewsContracts[] = {
-  { NS_NNTPURL_CONTRACTID, &kNS_NNTPURL_CID },
-  { NS_NNTPSERVICE_CONTRACTID, &kNS_NNTPSERVICE_CID },
-  { NS_NEWSSTARTUPHANDLER_CONTRACTID, &kNS_NNTPSERVICE_CID },
-  { NS_NNTPPROTOCOLINFO_CONTRACTID, &kNS_NNTPSERVICE_CID },
-  { NS_NNTPMESSAGESERVICE_CONTRACTID, &kNS_NNTPSERVICE_CID },
-  { NS_NEWSMESSAGESERVICE_CONTRACTID, &kNS_NNTPSERVICE_CID },
-  { NS_NEWSPROTOCOLHANDLER_CONTRACTID, &kNS_NNTPSERVICE_CID },
-  { NS_SNEWSPROTOCOLHANDLER_CONTRACTID, &kNS_NNTPSERVICE_CID },
-  { NS_NNTPPROTOCOLHANDLER_CONTRACTID, &kNS_NNTPSERVICE_CID },
-  { NS_CONTENT_HANDLER_CONTRACTID_PREFIX"x-application-newsgroup", &kNS_NNTPSERVICE_CID },
-  { NS_CONTENT_HANDLER_CONTRACTID_PREFIX"x-application-newsgroup-listids", &kNS_NNTPSERVICE_CID },
-  { NS_NEWSFOLDERRESOURCE_CONTRACTID, &kNS_NEWSFOLDERRESOURCE_CID },
-  { NS_NNTPINCOMINGSERVER_CONTRACTID, &kNS_NNTPINCOMINGSERVER_CID },
-  { NS_NNTPNEWSGROUPPOST_CONTRACTID, &kNS_NNTPNEWSGROUPPOST_CID },
-  { NS_NNTPNEWSGROUPLIST_CONTRACTID, &kNS_NNTPNEWSGROUPLIST_CID },
-  { NS_NNTPARTICLELIST_CONTRACTID, &kNS_NNTPARTICLELIST_CID },
-  { NS_NEWSDOWNLOADDIALOGARGS_CONTRACTID, &kNS_NEWSDOWNLOADDIALOGARGS_CID },
-  { NULL }
-};
-
-static const mozilla::Module kMsgNewsModule = {
-    mozilla::Module::kVersion,
-    kMsgNewsCIDs,
-    kMsgNewsContracts,
-    kMsgNewsCategories
-};
-
-NSMODULE_DEFN(msgnews) = &kMsgNewsModule;
-
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -37,17 +37,16 @@
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
 MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
-MOZ_STATIC_MAIL_BUILD=1
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_COMPOSER=1
 MOZ_SUITE=1
 MOZ_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs"
 MOZ_UPDATER=1
 MOZ_HELP_VIEWER=1