--- a/mail/configure.in
+++ b/mail/configure.in
@@ -42,17 +42,16 @@ MOZ_ARG_ENABLE_BOOL(calendar,
     MOZ_CALENDAR= )
 AC_SUBST(MOZ_CALENDAR)
 
 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= )
 
-export MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 AC_SUBST(MOZ_INCOMPLETE_EXTERNAL_LINKAGE)
 
 dnl =========================================================
 dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
@@ -72,33 +71,30 @@ if test "$MOZ_LDAP_XPCOM"; then
             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
 
-    dnl export LDAP_LIBS so that confvars.sh can pick it up, so when we get to
-    dnl linking libxul in the mozilla-central build system, we'll have the LDAP
-    dnl LIBS
-    export LDAP_LIBS
     LDAP_COMPONENT=mozldap
-    export LDAP_COMPONENT
     LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
-    export LDAP_MODULE
 fi
 AC_SUBST(MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE)
 
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
 
-# Rerun the confvars, since we need to add to our components list.
-. "${srcdir}/${MOZ_BUILD_APP}/confvars.sh"
+if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
+  MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
+  MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
+  MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
+fi
 
 # Check for PBBUILD on OS X.
 case "$target_os" in
 darwin*)
   for name in pbbuild xcodebuild pbxbuild; do
     PBBUILD_BIN=`which $name`
     test -n "$PBBUILD_BIN" && break
   done

--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -31,21 +31,16 @@ MOZ_WEBRTC=
 MOZ_SAFE_BROWSING=1
 MOZ_MORK=1
 MAIL_COMPONENT="mail msgsmime import"
 MAIL_MODULE="MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule)"
 if test -n "$_WIN32_MSVC"; then
   MAIL_COMPONENT="$MAIL_COMPONENT msgMapi"
   MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
 fi
-if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
-MOZ_APP_COMPONENT_LIBS="xpautocomplete mailcomps $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
-MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
-MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
-fi
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 
 MOZ_UA_BUILDID=20100101
 
 MOZ_BRANDING_DIRECTORY=mail/branding/nightly

--- a/suite/configure.in
+++ b/suite/configure.in
@@ -42,17 +42,16 @@ MOZ_ARG_ENABLE_BOOL(calendar,
     MOZ_CALENDAR= )
 AC_SUBST(MOZ_CALENDAR)
 
 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= )
 
-export MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 AC_SUBST(MOZ_INCOMPLETE_EXTERNAL_LINKAGE)
 
 dnl =========================================================
 dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
@@ -72,33 +71,30 @@ if test "$MOZ_LDAP_XPCOM"; then
             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
 
-    dnl export LDAP_LIBS so that confvars.sh can pick it up, so when we get to
-    dnl linking libxul in the mozilla-central build system, we'll have the LDAP
-    dnl LIBS
-    export LDAP_LIBS
     LDAP_COMPONENT=mozldap
-    export LDAP_COMPONENT
     LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
-    export LDAP_MODULE
 fi
 AC_SUBST(MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE)
 
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
 
-# Rerun the confvars, since we need to add to our components list.
-. "${srcdir}/${MOZ_BUILD_APP}/confvars.sh"
+if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
+  MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
+  MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
+  MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
+fi
 
 # if we're building the LDAP XPCOM component, we need to build
 # the c-sdk first.
 if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
     # Save configure args so we can restore them after configuring LDAP.
     _save_ac_configure_args="$ac_configure_args"
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 

--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -26,21 +26,16 @@ MOZ_MEDIA_NAVIGATOR=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
 MAIL_COMPONENT="mail msgsmime import"
 MAIL_MODULE="MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule)"
 if test -n "$_WIN32_MSVC"; then
   MAIL_COMPONENT="$MAIL_COMPONENT msgMapi"
   MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
 fi
-if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
-MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
-MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
-MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
-fi
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_SYNC=1
 MOZ_URL_CLASSIFIER=1
 # Disable WebRTC as we don't use it currently and to work around bug 837618
 # for Mac
 MOZ_WEBRTC=