Bug 1053444 - Remove MOZ_APP_COMPONENT_MODULES from comm-central r=jcranmer for a CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Tue, 19 Aug 2014 21:18:56 +0100
changeset 16665 20f1d86420b904ab7dfd310eeb8b97d97abe695a
parent 16664 5c7fab2d17abe1ff9f655523b0e98e0a2b80a989
child 16666 45acc039fecd6501c7c2dbb4c2ee9d295e02471e
push id10375
push useriann_cvs@blueyonder.co.uk
push dateTue, 19 Aug 2014 20:19:21 +0000
treeherdercomm-central@45acc039fecd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs1053444
Bug 1053444 - Remove MOZ_APP_COMPONENT_MODULES from comm-central r=jcranmer for a CLOSED TREE
mail/configure.in
mail/confvars.sh
suite/configure.in
suite/confvars.sh
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -9,17 +9,16 @@ AC_DEFINE(MOZ_THUNDERBIRD)
 AC_SUBST(MOZ_THUNDERBIRD)
 AC_SUBST(MOZ_COMPOSER)
 AC_SUBST(THUNDERBIRD_VERSION)
 
 dnl Optional parts of the build.
 AC_SUBST(MOZ_MORK)
 if test "$MOZ_MORK"; then
   AC_DEFINE(MOZ_MORK)
-  MORK_MODULE="MODULE(nsMorkModule)"
 fi
 if test "$OS_ARCH" != "WINNT"; then
   MOZ_MOVEMAIL=1
   HAVE_MOVEMAIL=1
   AC_DEFINE(HAVE_MOVEMAIL)
 fi
 AC_SUBST(MOZ_MOVEMAIL)
 
@@ -48,17 +47,16 @@ dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)
 
 if test "$MOZ_LDAP_XPCOM"; then
     LDAP_CFLAGS='-I${DIST}/public/ldap'
-    LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
 fi
 
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(LDAP_CFLAGS)
 
 dnl =========================================================
 dnl = MAPI support (Windows only)
 dnl =========================================================
@@ -70,21 +68,16 @@ fi
 MOZ_ARG_DISABLE_BOOL(mapi,
 [  --disable-mapi          Disable MAPI support],
     MOZ_MAPI_SUPPORT= )
 
 AC_SUBST(MOZ_MAPI_SUPPORT)
 
 if test -n "$MOZ_MAPI_SUPPORT"; then
     AC_DEFINE(MOZ_MAPI_SUPPORT)
-    MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
-fi
-
-if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
-  MOZ_APP_COMPONENT_MODULES="MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
 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/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -18,17 +18,16 @@ if test "$OS_ARCH" = "WINNT"; then
     MOZ_VERIFY_MAR_SIGNATURE=1
     MOZ_MAINTENANCE_SERVICE=1
   fi
 fi
 
 MOZ_SAFE_BROWSING=1
 MOZ_MEDIA_NAVIGATOR=1
 MOZ_MORK=1
-MAIL_MODULE="MODULE(nsMailModule) MODULE(nsImportServiceModule)"
 
 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
@@ -9,17 +9,16 @@ AC_DEFINE(MOZ_SUITE)
 AC_SUBST(MOZ_SUITE)
 AC_SUBST(MOZ_COMPOSER)
 AC_SUBST(SEAMONKEY_VERSION)
 
 dnl Optional parts of the build.
 AC_SUBST(MOZ_MORK)
 if test "$MOZ_MORK"; then
   AC_DEFINE(MOZ_MORK)
-  MORK_MODULE="MODULE(nsMorkModule)"
 fi
 if test "$OS_ARCH" != "WINNT"; then
   MOZ_MOVEMAIL=1
   HAVE_MOVEMAIL=1
   AC_DEFINE(HAVE_MOVEMAIL)
 fi
 AC_SUBST(MOZ_MOVEMAIL)
 
@@ -48,17 +47,16 @@ dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)
 
 if test "$MOZ_LDAP_XPCOM"; then
     LDAP_CFLAGS='-I${DIST}/public/ldap'
-    LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
 fi
 
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(LDAP_CFLAGS)
 
 dnl =========================================================
 dnl = MAPI support (Windows only)
 dnl =========================================================
@@ -70,21 +68,16 @@ fi
 MOZ_ARG_DISABLE_BOOL(mapi,
 [  --disable-mapi          Disable MAPI support],
     MOZ_MAPI_SUPPORT= )
 
 AC_SUBST(MOZ_MAPI_SUPPORT)
 
 if test -n "$MOZ_MAPI_SUPPORT"; then
     AC_DEFINE(MOZ_MAPI_SUPPORT)
-    MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
-fi
-
-if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
-  MOZ_APP_COMPONENT_MODULES="$MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
 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
@@ -20,17 +20,16 @@ MOZ_UPDATER=1
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-central
 MOZ_HELP_VIEWER=1
 MOZ_MEDIA_NAVIGATOR=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
-MAIL_MODULE="MODULE(nsMailModule) MODULE(nsImportServiceModule)"
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_FXACCOUNTS=1
 MOZ_SERVICES_SYNC=1
 MOZ_URL_CLASSIFIER=1
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`