From 5d0fe8cfbf76f8018025fe581522e7736e69e86e Mon Sep 17 00:00:00 2001 From: "mattwillis%gmail.com" Date: Tue, 13 Jun 2006 18:05:51 +0000 Subject: [PATCH] bug 340559 moves sunbird configure's default build options into configure.in. r/branch=bsmedberg --- calendar/sunbird/config/mozconfig | 16 ---------------- configure.in | 11 +++++++++++ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/calendar/sunbird/config/mozconfig b/calendar/sunbird/config/mozconfig index 9b5cd8b2d37..6a4f47b678f 100644 --- a/calendar/sunbird/config/mozconfig +++ b/calendar/sunbird/config/mozconfig @@ -1,22 +1,6 @@ - # This file specifies the build flags for Sunbird. You can use it by adding: # . $topsrcdir/calendar/sunbird/config/mozconfig # to the top of your mozconfig file. mk_add_options MOZ_CO_PROJECT=calendar ac_add_options --enable-application=calendar - -ac_add_options --enable-plaintext-editor-only -ac_add_options --enable-necko-protocols=about,http,ftp,file,res -ac_add_options --enable-storage -ac_add_options --disable-accessibility -ac_add_options --disable-activex -ac_add_options --disable-activex-scripting -ac_add_options --disable-installer -ac_add_options --disable-mathml -ac_add_options --disable-necko-disk-cache -ac_add_options --disable-oji -ac_add_options --disable-view-source -ac_add_options --disable-logging -ac_add_options --disable-plugins -ac_add_options --disable-cookies diff --git a/configure.in b/configure.in index 94db5e00615..eeabe8599f7 100644 --- a/configure.in +++ b/configure.in @@ -4320,6 +4320,17 @@ calendar) MOZ_SUNBIRD=1 MOZ_CALENDAR=1 MOZ_APP_VERSION=$SUNBIRD_VERSION + MOZ_PLAINTEXT_EDITOR_ONLY=1 + NECKO_PROTOCOLS_DEFAULT="about http ftp file res" + MOZ_NO_ACTIVEX_SUPPORT=1 + MOZ_ACTIVEX_SCRIPTING_SUPPORT= + MOZ_INSTALLER= + MOZ_MATHML= + NECKO_DISK_CACHE= + MOZ_OJI= + MOZ_VIEW_SOURCE= + MOZ_PLUGINS= + NECKO_COOKIES= MOZ_NO_XPCOM_OBSOLETE=1 MOZ_EXTENSIONS_DEFAULT= MOZ_UNIVERSALCHARDET=