Bug 905155 Stop linking the XPFE autocomplete component into libxul r=Standard8
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sun, 18 Aug 2013 00:09:16 +0100
changeset 16404 118b12c0499fc6d6d7c324c8ec14a96906f47788
parent 16403 3b8f49a1c86469c2f06ec43f7ae4d7c982dd6b0f
child 16405 d13e87b882054c4bd7f2dcfc75723408bb822c49
push id1019
push userbugzilla@standard8.plus.com
push dateMon, 28 Oct 2013 22:08:40 +0000
treeherdercomm-beta@c81d5f517a5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs905155
Bug 905155 Stop linking the XPFE autocomplete component into libxul r=Standard8
mail/configure.in
suite/configure.in
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -95,18 +95,18 @@ MOZ_ARG_DISABLE_BOOL(mapi,
 
 AC_SUBST(MOZ_MAPI_SUPPORT)
 
 if test -n "$MOZ_MAPI_SUPPORT"; then
     AC_DEFINE(MOZ_MAPI_SUPPORT)
 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_COMPONENT_LIBS="mailcomps $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
+  MOZ_APP_COMPONENT_MODULES="MODULE(nsMailCompsModule) $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`
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -95,24 +95,18 @@ MOZ_ARG_DISABLE_BOOL(mapi,
 
 AC_SUBST(MOZ_MAPI_SUPPORT)
 
 if test -n "$MOZ_MAPI_SUPPORT"; then
     AC_DEFINE(MOZ_MAPI_SUPPORT)
 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
-
-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_COMPONENT_LIBS="$MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
+  MOZ_APP_COMPONENT_MODULES="$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"