Bug 445143 - "clean mozilla-central from unneeded references to suite, mail, etc." [r=Standard8 r=ted]
authorArpad Borsos <arpad.borsos@googlemail.com>
Tue, 19 Aug 2008 23:05:00 -0500
changeset 17103 c10e93ebe6bb18000a6ea364397831a8f1c4be9e
parent 17102 d9870269f8fbf4da4cfac9c0872a78030d9d529f
child 17104 4460de8869d84a2e6cfc7950f27e4a991ae076a9
push id1409
push userreed@reedloden.com
push dateWed, 20 Aug 2008 04:05:13 +0000
treeherdermozilla-central@c10e93ebe6bb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, ted
bugs445143
milestone1.9.1a2pre
Bug 445143 - "clean mozilla-central from unneeded references to suite, mail, etc." [r=Standard8 r=ted]
client.mk
config/autoconf.mk.in
config/static-config.mk
configure.in
toolkit/toolkit-makefiles.sh
toolkit/toolkit-tiers.mk
--- a/client.mk
+++ b/client.mk
@@ -39,18 +39,17 @@
 # ***** END LICENSE BLOCK *****
 
 # Build a mozilla application.
 #
 # To build a tree,
 #    1. hg clone ssh://hg.mozilla.org/mozilla-central mozilla
 #    2. cd mozilla
 #    3. create your .mozconfig file with
-#       mk_add_options MOZ_CO_PROJECT=
-#         suite,browser
+#       ac_add_options --enable-application=browser
 #    4. gmake -f client.mk 
 #
 # Other targets (gmake -f client.mk [targets...]),
 #    build
 #    clean (realclean is now the same as clean)
 #    distclean
 #
 # See http://developer.mozilla.org/en/docs/Build_Documentation for 
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -39,19 +39,16 @@
 # A netscape style .mk file for autoconf builds
 
 INCLUDED_AUTOCONF_MK = 1
 USE_AUTOCONF 	= 1
 MOZILLA_CLIENT	= 1
 BUILD_MODULES	= @BUILD_MODULES@
 MOZILLA_VERSION = @MOZILLA_VERSION@
 FIREFOX_VERSION	= @FIREFOX_VERSION@
-THUNDERBIRD_VERSION	= @THUNDERBIRD_VERSION@
-SUNBIRD_VERSION = @SUNBIRD_VERSION@
-SEAMONKEY_VERSION	= @SEAMONKEY_VERSION@
 
 MOZ_BUILD_APP = @MOZ_BUILD_APP@
 MOZ_APP_NAME	= @MOZ_APP_NAME@
 MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
 MOZ_APP_VERSION = @MOZ_APP_VERSION@
 
 MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
 
@@ -131,18 +128,16 @@ MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@
 ENABLE_TESTS	= @ENABLE_TESTS@
 IBMBIDI = @IBMBIDI@
 MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHARDET@
 ACCESSIBILITY = @ACCESSIBILITY@
 MOZ_VIEW_SOURCE = @MOZ_VIEW_SOURCE@
 MOZ_XPINSTALL = @MOZ_XPINSTALL@
 MOZ_JSLOADER  = @MOZ_JSLOADER@
 MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
-MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
-MOZ_LDAP_XPCOM_EXPERIMENTAL = @MOZ_LDAP_XPCOM_EXPERIMENTAL@
 MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
 XPCOM_USE_LEA = @XPCOM_USE_LEA@
 JS_ULTRASPARC_OPTS = @JS_ULTRASPARC_OPTS@
 JS_STATIC_BUILD = @JS_STATIC_BUILD@
 MOZ_ENABLE_POSTSCRIPT = @MOZ_ENABLE_POSTSCRIPT@
 MOZ_INSTALLER	= @MOZ_INSTALLER@
 MOZ_UPDATER	= @MOZ_UPDATER@
 MOZ_UPDATE_PACKAGING	= @MOZ_UPDATE_PACKAGING@
@@ -462,18 +457,16 @@ NSPR_CONFIG	= @NSPR_CONFIG@
 NSPR_CFLAGS	= @NSPR_CFLAGS@
 NSPR_LIBS	= @NSPR_LIBS@
 
 NSS_CONFIG	= @NSS_CONFIG@
 NSS_CFLAGS	= @NSS_CFLAGS@
 NSS_LIBS	= @NSS_LIBS@
 NSS_DEP_LIBS	= @NSS_DEP_LIBS@
 
-LDAP_CFLAGS	= @LDAP_CFLAGS@
-LDAP_LIBS	= @LDAP_LIBS@
 XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@
 XPCOM_STANDALONE_GLUE_LDOPTS = @XPCOM_STANDALONE_GLUE_LDOPTS@
 MOZ_XPCOM_OBSOLETE_LIBS = @MOZ_XPCOM_OBSOLETE_LIBS@
 
 USE_DEPENDENT_LIBS = @USE_DEPENDENT_LIBS@
 
 # UNIX98 iconv support
 LIBICONV = @LIBICONV@
@@ -619,21 +612,17 @@ MOZ_PYTHON_VER_DOTTED = @MOZ_PYTHON_VER_
 MOZ_PYTHON_VER = @MOZ_PYTHON_VER@
 
 # Codesighs tools option, enables win32 mapfiles.
 MOZ_MAPINFO	= @MOZ_MAPINFO@
 
 MOZ_PHOENIX	= @MOZ_PHOENIX@
 MOZ_XULRUNNER	= @MOZ_XULRUNNER@
 MOZ_XUL_APP	= @MOZ_XUL_APP@
-MOZ_THUNDERBIRD = @MOZ_THUNDERBIRD@
 MOZ_STANDALONE_COMPOSER= @MOZ_STANDALONE_COMPOSER@
-MOZ_STATIC_MAIL_BUILD = @MOZ_STATIC_MAIL_BUILD@
-MOZ_SUNBIRD	= @MOZ_SUNBIRD@
-MOZ_SUITE	= @MOZ_SUITE@
 WINCE		= @WINCE@
 
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
 NS_HILDON	= @NS_HILDON@
 NS_OSSO 	= @NS_OSSO@
 
 
--- a/config/static-config.mk
+++ b/config/static-config.mk
@@ -73,22 +73,16 @@ STATIC_EXTRA_LIBS	+= \
 		$(NULL)
 
 ifdef MOZ_PSM
 STATIC_EXTRA_LIBS	+= \
 		$(NSS_LIBS) \
 		$(NULL)
 endif
 
-ifdef MOZ_LDAP_XPCOM
-STATIC_EXTRA_LIBS	+= \
-		$(LDAP_LIBS) \
-		$(NULL)
-endif
-
 STATIC_EXTRA_LIBS	+= $(MOZ_CAIRO_LIBS)
 
 ifdef MOZ_ENABLE_GTK2
 STATIC_EXTRA_LIBS	+= $(XLDFLAGS) $(XT_LIBS) -lgthread-2.0
 STATIC_EXTRA_LIBS	+= $(MOZ_XFT_LIBS)
 STATIC_EXTRA_LIBS	+= $(MOZ_PANGO_LIBS)
 endif
 
--- a/configure.in
+++ b/configure.in
@@ -1569,19 +1569,16 @@ case "$host" in
     ;;
 esac
 
 dnl Get mozilla version from central milestone file
 MOZILLA_VERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir`
 
 dnl Get version of various core apps from the version files.
 FIREFOX_VERSION=`cat $topsrcdir/browser/config/version.txt`
-THUNDERBIRD_VERSION=`cat $topsrcdir/mail/config/version.txt`
-SUNBIRD_VERSION=`cat $topsrcdir/calendar/sunbird/config/version.txt`
-SEAMONKEY_VERSION=`cat $topsrcdir/suite/config/version.txt`
 
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
 
 dnl ========================================================
 dnl System overrides of the defaults for target
 dnl ========================================================
 
@@ -4313,31 +4310,28 @@ dnl =
 dnl ========================================================
 
 MOZ_ARG_HEADER(Application)
 
 BUILD_STATIC_LIBS=
 ENABLE_TESTS=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_BRANDING_DIRECTORY=
-MOZ_CALENDAR=
 MOZ_DBGRINFO_MODULES=
 MOZ_ENABLE_CANVAS=1
 MOZ_EXTENSIONS_ALL=" wallet p3p venkman inspector irc typeaheadfind gnomevfs sroaming datetime finger cview layout-debug tasks sql xforms schema-validation reporter"
 MOZ_FEEDS=1
 MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp xbm icon"
 MOZ_IMG_ENCODERS_DEFAULT="png jpeg"
 MOZ_IPCD=
 MOZ_JAVAXPCOM=
 MOZ_JSDEBUGGER=1
 MOZ_JSLOADER=1
-MOZ_LDAP_XPCOM=
 MOZ_LIBART_CFLAGS=
 MOZ_LIBART_LIBS=
-MOZ_MAIL_NEWS=
 MOZ_MATHML=1
 MOZ_MOCHITEST=1
 MOZ_MORK=1
 MOZ_MORKREADER=
 MOZ_AUTH_EXTENSION=1
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_NO_INSPECTOR_APIS=
 MOZ_NO_XPCOM_OBSOLETE=
@@ -4410,21 +4404,18 @@ case "$target_os" in
             MOZ_ACTIVEX_SCRIPTING_SUPPORT=1
         fi
         ;;
 esac
 
 MOZ_ARG_ENABLE_STRING(application,
 [  --enable-application=APP
                           Options include:
-                            suite
                             browser (Firefox)
-                            mail (Thunderbird)
                             composer
-                            calendar (Sunbird)
                             xulrunner
                             camino
                             content/xslt (Standalone Transformiix XSLT)
                             netwerk (Standalone Necko)
                             tools/update-packaging (AUS-related packaging tools)
                             standalone (use this for standalone
                               xpcom/xpconnect or to manually drive a build)],
 [ MOZ_BUILD_APP=$enableval ] )
@@ -4462,18 +4453,16 @@ basic)
   MOZ_ENABLE_CANVAS=
   MOZ_ENABLE_POSTSCRIPT=
   MOZ_EXTENSIONS_DEFAULT=" spatialnavigation"
   MOZ_IMG_DECODERS_DEFAULT="png gif jpeg"
   MOZ_IMG_ENCODERS_DEFAULT=
   MOZ_IMG_ENCODERS=
   MOZ_INSTALLER=
   MOZ_JSDEBUGGER=
-  MOZ_LDAP_XPCOM=
-  MOZ_MAIL_NEWS=
   MOZ_MATHML=
   MOZ_AUTH_EXTENSION=
   MOZ_NO_ACTIVEX_SUPPORT=1
   MOZ_NO_INSPECTOR_APIS=1
   MOZ_NO_XPCOM_OBSOLETE=1
   MOZ_NO_FAST_LOAD=1
   MOZ_OJI=
   MOZ_PLAINTEXT_EDITOR_ONLY=1
@@ -4510,18 +4499,16 @@ minimal)
   MOZ_ENABLE_CANVAS=
   MOZ_ENABLE_POSTSCRIPT=
   MOZ_EXTENSIONS_DEFAULT=" spatialnavigation"
   MOZ_IMG_DECODERS_DEFAULT="png gif jpeg"
   MOZ_IMG_ENCODERS_DEFAULT=
   MOZ_IMG_ENCODERS=
   MOZ_INSTALLER=
   MOZ_JSDEBUGGER=
-  MOZ_LDAP_XPCOM=
-  MOZ_MAIL_NEWS=
   MOZ_MATHML=
   MOZ_AUTH_EXTENSION=
   MOZ_NO_ACTIVEX_SUPPORT=1
   MOZ_NO_INSPECTOR_APIS=1
   MOZ_NO_XPCOM_OBSOLETE=1
   MOZ_NO_FAST_LOAD=1
   MOZ_OJI=
   MOZ_PLAINTEXT_EDITOR_ONLY=1
@@ -4610,36 +4597,24 @@ xulrunner)
   fi
   ;;
 esac
 
 # Special cases where we need to AC_DEFINE something. Also a holdover for apps
 # that haven't made a confvars.sh yet. Don't add new stuff here, use
 # MOZ_BUILD_APP.
 case "$MOZ_BUILD_APP" in
-suite)
-  AC_DEFINE(MOZ_SUITE)
-  ;;
-
 browser)
   AC_DEFINE(MOZ_PHOENIX)
   ;;
 
-mail)
-  AC_DEFINE(MOZ_THUNDERBIRD)
-  ;;
-
 composer)
   AC_DEFINE(MOZ_STANDALONE_COMPOSER)
   ;;
 
-calendar)
-  AC_DEFINE(MOZ_SUNBIRD)
-  ;;
-
 xulrunner)
   AC_DEFINE(MOZ_XULRUNNER)
   ;;
 
 camino) 
   AC_DEFINE(MOZ_MACBROWSER)
   ;;
 
@@ -4652,21 +4627,18 @@ standalone)
   MOZ_APP_DISPLAYNAME=Mozilla
   MOZ_APP_VERSION=$MOZILLA_VERSION
   ;;
 
 esac
 
 AC_SUBST(MOZ_BUILD_APP)
 AC_SUBST(MOZ_XUL_APP)
-AC_SUBST(MOZ_SUITE)
 AC_SUBST(MOZ_PHOENIX)
-AC_SUBST(MOZ_THUNDERBIRD)
 AC_SUBST(MOZ_STANDALONE_COMPOSER)
-AC_SUBST(MOZ_SUNBIRD)
 AC_SUBST(MOZ_XULRUNNER)
 
 AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP)
 
 if test "$MOZ_XUL_APP"; then
   MOZ_PROFILESHARING=
   AC_DEFINE(MOZ_XUL_APP)
 fi
@@ -4936,79 +4908,33 @@ dnl ====================================
 dnl = Localization
 dnl ========================================================
 MOZ_ARG_ENABLE_STRING(ui-locale,
 [  --enable-ui-locale=ab-CD
                           Select the user interface locale (default: en-US)],
     MOZ_UI_LOCALE=$enableval )
 AC_SUBST(MOZ_UI_LOCALE)
 
-dnl =========================================================
-dnl = Calendar client
-dnl =========================================================
-MOZ_ARG_ENABLE_BOOL(calendar,,
-    MOZ_OLD_CALENDAR=1,
-    MOZ_OLD_CALENDAR= )
-
-if test "$MOZ_OLD_CALENDAR"; then
-    AC_MSG_WARN([Building with the calendar extension is no longer supported.])
-    if test "$MOZ_THUNDERBIRD"; then
-        AC_MSG_WARN([Since you're trying to build mail, you could try adding])
-        AC_MSG_WARN(['--enable-extensions=default,lightning' to your mozconfig])
-        AC_MSG_WARN([and building WITH A FRESH TREE.])
-    fi
-    AC_MSG_WARN([For more information, please visit:])
-    AC_MSG_ERROR([http://www.mozilla.org/projects/calendar/])
-fi
-
-AC_SUBST(MOZ_CALENDAR)
-
-dnl =========================================================
-dnl = Mail & News
-dnl =========================================================
-MOZ_ARG_DISABLE_BOOL(mailnews,
-[  --disable-mailnews      Disable building of mail & news components],
-    MOZ_MAIL_NEWS=,
-    MOZ_MAIL_NEWS=1 )
-AC_SUBST(MOZ_MAIL_NEWS)
-
-dnl =========================================================
-dnl = LDAP
-dnl =========================================================
-MOZ_ARG_DISABLE_BOOL(ldap,
-[  --disable-ldap          Disable LDAP support],
-    MOZ_LDAP_XPCOM=,
-    MOZ_LDAP_XPCOM=1)
-
 dnl ========================================================
 dnl = Trademarked Branding 
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(official-branding,
 [  --enable-official-branding Enable Official mozilla.org Branding
                           Do not distribute builds with
                           --enable-official-branding unless you have
                           permission to use trademarks per
                           http://www.mozilla.org/foundation/trademarks/ .],
 [case "$MOZ_BUILD_APP" in
 browser)
     MOZ_BRANDING_DIRECTORY=other-licenses/branding/firefox
     MOZ_APP_DISPLAYNAME=Firefox
     ;;
 
-calendar)
-    MOZ_BRANDING_DIRECTORY=other-licenses/branding/sunbird
-    MOZ_APP_DISPLAYNAME=Sunbird
-    ;;
-
-mail)
-    MOZ_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
-    ;;
-
 *)]
-    AC_MSG_ERROR([Official branding is only available for Firefox Sunbird and Thunderbird.])
+    AC_MSG_ERROR([Official branding is only available for Firefox.])
 esac
 )
 
 MOZ_ARG_WITH_STRING(branding,
 [  --with-branding=dir    Use branding from the specified directory.],
     MOZ_BRANDING_DIRECTORY=$withval)
 
 REAL_BRANDING_DIRECTORY="${MOZ_BRANDING_DIRECTORY}"
@@ -5769,25 +5695,16 @@ MOZ_ARG_ENABLE_STRING(image-encoders,
 done],
     MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS_DEFAULT")
 
 dnl Remove dupes
 MOZ_IMG_DECODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_DECODERS}`
 MOZ_IMG_ENCODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_ENCODERS}`
 
 dnl ========================================================
-dnl experimental ldap features
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(ldap-experimental,
-[  --enable-ldap-experimental
-                          Enable LDAP experimental features],
-    MOZ_LDAP_XPCOM_EXPERIMENTAL=1,
-    MOZ_LDAP_XPCOM_EXPERIMENTAL=)
-
-dnl ========================================================
 dnl MathML on by default
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(mathml,
 [  --disable-mathml        Disable MathML support],
     MOZ_MATHML=,
     MOZ_MATHML=1 )
 if test "$MOZ_MATHML"; then
   AC_DEFINE(MOZ_MATHML)
@@ -7266,31 +7183,16 @@ if test -n "$JS_STATIC_BUILD"; then
     AC_DEFINE(EXPORT_JS_API)
 
 if test -z "$BUILD_STATIC_LIBS"; then
     AC_MSG_ERROR([--enable-js-static-build is only compatible with --enable-static])
 fi
 
 fi
 
-dnl Disable static mail in debug builds, but not with libxul sdk.
-if test -n "$MOZ_DEBUG" -a -z "$LIBXUL_SDK"; 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 "$MOZ_STATIC_MAIL_BUILD"; then
-    AC_DEFINE(MOZ_STATIC_MAIL_BUILD)
-fi
-
-AC_SUBST(MOZ_STATIC_MAIL_BUILD)
-
 dnl ========================================================
 dnl =
 dnl = Standalone module options
 dnl = 
 dnl ========================================================
 MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla))
 
 dnl Check for GLib and libIDL.
@@ -7885,31 +7787,16 @@ if test "$MOZ_MORKREADER"; then
   AC_DEFINE(MOZ_MORKREADER)
 fi
 
 dnl ========================================================
 if test "$MOZ_DEBUG" || test "$NS_TRACE_MALLOC"; then
     MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
 fi
 
-if test "$MOZ_LDAP_XPCOM"; then
-    LDAP_CFLAGS='-I${DIST}/public/ldap'
-    if test "$OS_ARCH" = "WINNT"; then
-        if test -n "$GNU_CC"; then
-            LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
-        else
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}'
-        fi
-    elif test "$OS_ARCH" = "OS2"; then
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}'
-    else
-        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
-    fi
-fi
-
 dnl ========================================================
 dnl =
 dnl = Maintainer debug option (no --enable equivalent)
 dnl =
 dnl ========================================================
 
 AC_SUBST(AR)
 AC_SUBST(AR_FLAGS)
@@ -7974,20 +7861,16 @@ AC_SUBST(MOZ_VTUNE)
 AC_SUBST(MOZ_XPCTOOLS)
 AC_SUBST(MOZ_JSLOADER)
 AC_SUBST(MOZ_USE_NATIVE_UCONV)
 AC_SUBST(MOZ_INSURE)
 AC_SUBST(MOZ_INSURE_DIRS)
 AC_SUBST(MOZ_INSURE_EXCLUDE_DIRS)
 AC_SUBST(MOZ_QUANTIFY)
 AC_SUBST(MOZ_INSURIFYING)
-AC_SUBST(MOZ_LDAP_XPCOM)
-AC_SUBST(MOZ_LDAP_XPCOM_EXPERIMENTAL)
-AC_SUBST(LDAP_CFLAGS)
-AC_SUBST(LDAP_LIBS)
 AC_SUBST(LIBICONV)
 AC_SUBST(MOZ_PLACES)
 AC_SUBST(MOZ_PLACES_BOOKMARKS)
 AC_SUBST(MOZ_STORAGE)
 AC_SUBST(MOZ_FEEDS)
 AC_SUBST(NS_PRINTING)
 
 AC_SUBST(MOZ_JAVAXPCOM)
@@ -8046,19 +7929,16 @@ AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_TIMELINE)
 AC_SUBST(WINCE)
 AC_SUBST(TARGET_DEVICE)
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_VERSION)
 AC_SUBST(FIREFOX_VERSION)
-AC_SUBST(THUNDERBIRD_VERSION)
-AC_SUBST(SUNBIRD_VERSION)
-AC_SUBST(SEAMONKEY_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 
 AC_SUBST(MOZILLA_OFFICIAL)
 AC_SUBST(BUILD_OFFICIAL)
 AC_SUBST(MOZ_MILESTONE_RELEASE)
 
 dnl win32 options
@@ -8448,17 +8328,17 @@ HOST_CC="$_SUBDIR_HOST_CC"
 HOST_CFLAGS="$_SUBDIR_HOST_CFLAGS"
 HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
 RC=
 
 unset MAKEFILES
 unset CONFIG_FILES
 
 if test "$COMPILE_ENVIRONMENT"; then
-if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then
+if test -z "$MOZ_NATIVE_NSPR"; then
     ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
     if test -z "$MOZ_DEBUG"; then
         ac_configure_args="$ac_configure_args --disable-debug"
     fi
     if test "$MOZ_OPTIMIZE" = "1"; then
         ac_configure_args="$ac_configure_args --enable-optimize"
     fi
     if test "$OS_ARCH" = "WINNT" && test "$NS_TRACE_MALLOC"; then
@@ -8483,41 +8363,10 @@ if test -z "$MOZ_NATIVE_NSPR"; then
     fi
     if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE" ; then
        _cflags=`./nsprpub/config/nspr-config --prefix=$\(LIBXUL_DIST\) --exec-prefix=$\(DIST\) --includedir=$\(LIBXUL_DIST\)/include/nspr --cflags`
        $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $_cflags'" config/autoconf.mk
     fi
     rm -f config/autoconf.mk.bak
 fi
 
-# if we're building the LDAP XPCOM component, we need to build 
-# the c-sdk first.  
-#
-if test "$MOZ_LDAP_XPCOM"; then
-
-    # these subdirs may not yet have been created in the build tree.
-    # don't use the "-p" switch to mkdir, since not all platforms have it
-    #
-    if test ! -d "directory"; then
-        mkdir "directory"
-    fi
-    if test ! -d "directory/c-sdk"; then
-        mkdir "directory/c-sdk"    
-    fi
-    if test ! -d "directory/c-sdk/ldap"; then
-        mkdir "directory/c-sdk/ldap"    
-    fi
-
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla"
-    if test -z "$MOZ_DEBUG"; then
-        ac_configure_args="$ac_configure_args --disable-debug"
-    fi
-    if test "$MOZ_OPTIMIZE" = "1"; then
-        ac_configure_args="$ac_configure_args --enable-optimize"
-    fi
-    if test -n "$HAVE_64BIT_OS"; then
-        ac_configure_args="$ac_configure_args --enable-64bit"
-    fi
-    AC_OUTPUT_SUBDIRS(directory/c-sdk)
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-fi
 fi # COMPILE_ENVIRONMENT
 
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -921,35 +921,16 @@ if test -n "$MOZ_PSM"; then
     security/manager/pki/Makefile
     security/manager/pki/resources/Makefile
     security/manager/pki/src/Makefile
     security/manager/pki/public/Makefile
     security/manager/locales/Makefile
   "
 fi
 
-if test -n "$MOZ_CALENDAR"; then
-  add_makefiles "
-    calendar/Makefile
-    calendar/resources/Makefile
-    calendar/libical/Makefile
-    calendar/libical/src/Makefile
-    calendar/libical/src/libical/Makefile
-    calendar/libical/src/libicalss/Makefile
-    calendar/base/Makefile
-    calendar/base/public/Makefile
-    calendar/base/src/Makefile
-    calendar/base/build/Makefile
-    calendar/providers/Makefile
-    calendar/providers/memory/Makefile
-    calendar/providers/storage/Makefile
-    calendar/providers/composite/Makefile
-  "
-fi
-
 if test -n "$MOZ_IPCD"; then
   add_makefiles "
     ipc/ipcd/Makefile
     ipc/ipcd/daemon/public/Makefile
     ipc/ipcd/daemon/src/Makefile
     ipc/ipcd/client/public/Makefile
     ipc/ipcd/client/src/Makefile
     ipc/ipcd/shared/src/Makefile
@@ -1184,9 +1165,9 @@ if [ "$MOZ_OGG" ]; then
    $MAKEFILES_libvorbis
    $MAKEFILES_libtheora
    $MAKEFILES_liboggz
    $MAKEFILES_libogg
    $MAKEFILES_libfishsound
    $MAKEFILES_liboggplay
    $MAKEFILES_liboggplay_audio
  "
-fi
\ No newline at end of file
+fi
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -267,21 +267,16 @@ endif
 ifdef MOZ_ENABLE_LIBXUL
 tier_toolkit_dirs += xpcom/stub
 endif
 
 ifdef NS_TRACE_MALLOC
 tier_toolkit_dirs += tools/trace-malloc
 endif
 
-ifdef MOZ_LDAP_XPCOM
-tier_toolkit_staticdirs += directory/c-sdk
-tier_toolkit_dirs	+= directory/xpcom
-endif
-
 ifdef MOZ_ENABLE_GNOME_COMPONENT
 tier_toolkit_dirs    += toolkit/system/gnome
 endif
 
 ifdef MOZ_ENABLE_DBUS
 tier_toolkit_dirs    += toolkit/system/dbus
 endif