Try to fix
bug 913493 by actually linking MAPI support into xul.dll r=jcranmer a=Standard8
a=Callek for checkin to a CLOSED TREE
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -92,16 +92,18 @@ 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_COMPONENT="$MAIL_COMPONENT msgMapi"
+ MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
fi
if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
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
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -24,20 +24,16 @@ if test "$OS_ARCH" = "Darwin"; then
ACCESSIBILITY=
fi
MOZ_SAFE_BROWSING=1
MOZ_MEDIA_NAVIGATOR=1
MOZ_MORK=1
MAIL_COMPONENT="mail import"
MAIL_MODULE="MODULE(nsMailModule) MODULE(nsImportServiceModule)"
-if test -n "$MOZ_MAPI_SUPPORT"; then
- MAIL_COMPONENT="$MAIL_COMPONENT msgMapi"
- MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
-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/aurora
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -92,16 +92,18 @@ 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_COMPONENT="$MAIL_COMPONENT msgMapi"
+ MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
fi
if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
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
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -22,20 +22,16 @@ ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-
# 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_COMPONENT="mail import"
MAIL_MODULE="MODULE(nsMailModule) MODULE(nsImportServiceModule)"
-if test -n "$MOZ_MAPI_SUPPORT"; then
- MAIL_COMPONENT="$MAIL_COMPONENT msgMapi"
- MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
-fi
MOZ_SERVICES_COMMON=1
MOZ_SERVICES_CRYPTO=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`
SEAMONKEY_VERSION=$MOZ_APP_VERSION