From 14b83c3b76b4a75266d63650bd079f2c44a9f412 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Tue, 30 Aug 2005 14:05:12 +0000 Subject: [PATCH] Bug 306355 - Put default config information in configure, not in mail/config/mozconfig - r=mscott --- configure.in | 8 ++++++++ mail/config/mozconfig | 10 ---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index 0d3d80580436..ac772592aaaf 100644 --- a/configure.in +++ b/configure.in @@ -4078,6 +4078,14 @@ mail) MOZ_APP_DISPLAYNAME=Thunderbird MOZ_XUL_APP=1 MOZ_THUNDERBIRD=1 + MOZ_MATHML= + MOZ_NO_ACTIVEX_SUPPORT=1 + MOZ_ACTIVEX_SCRIPTING_SUPPORT= + ENABLE_TESTS= + MOZ_OJI= + NECKO_DISK_CACHE= + NECKO_PROTOCOLS="http,file,jar,viewsource,res,data" + MOZ_IMG_DECODERS_DEFAULT=`echo "$MOZ_IMG_DECODERS_DEFAULT" | sed "s/ xbm//"` MOZ_MAIL_NEWS=1 MOZ_LDAP_XPCOM=1 MOZ_STATIC_MAIL_BUILD=1 diff --git a/mail/config/mozconfig b/mail/config/mozconfig index 2994f1ab9f8c..782cd04a5e81 100644 --- a/mail/config/mozconfig +++ b/mail/config/mozconfig @@ -1,16 +1,6 @@ - # This file specifies the build flags for Thunderbird. You can use it by adding: # . $topsrcdir/mail/config/mozconfig # to the top of your mozconfig file. mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail - -ac_add_options --disable-mathml -ac_add_options --disable-activex -ac_add_options --disable-activex-scripting -ac_add_options --disable-tests -ac_add_options --disable-oji -ac_add_options --disable-necko-disk-cache -ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data -ac_add_options --enable-image-decoders=default,-xbm