Bug 514381 OJI incorrectly enabled in Thunderbird & Calendar builds. r=KaiRo
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 04 Sep 2009 09:07:22 +0100
changeset 3511 9583204313f7ab433bb526869413b7b24e995d9f
parent 3510 0bb2a0ee37c1af1c76d758c1eee1d99b18924704
child 3512 3e1287030b09076fb682c8d1c17258395afc4b2e
push idunknown
push userunknown
push dateunknown
reviewersKaiRo
bugs514381
Bug 514381 OJI incorrectly enabled in Thunderbird & Calendar builds. r=KaiRo
calendar/confvars.sh
mail/confvars.sh
--- a/calendar/confvars.sh
+++ b/calendar/confvars.sh
@@ -44,17 +44,17 @@ MOZ_CALENDAR=1
 MOZ_APP_VERSION=$SUNBIRD_VERSION
 MOZ_PLAINTEXT_EDITOR_ONLY=1
 NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource"
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_INSTALLER=
 MOZ_MATHML=
 NECKO_DISK_CACHE=
-if test "$MOZILLA_BRANCH_VERSION" = "1.9.1"; then
+# MOZ_OJI is only required to be cleared for MOZILLA_1_9_1_BRANCH.
+# mozilla-central does not have this.
 MOZ_OJI=
-fi
 NECKO_COOKIES=
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_EXTENSIONS_DEFAULT=
 MOZ_UNIVERSALCHARDET=
 MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/sunbird/config/version.txt`
 SUNBIRD_VERSION=$MOZ_APP_VERSION
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -36,19 +36,19 @@
 #
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=thunderbird
 MOZ_UPDATER=1
 MOZ_THUNDERBIRD=1
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
-if test "$MOZILLA_BRANCH_VERSION" = "1.9.1"; then
+# MOZ_OJI is only required to be cleared for MOZILLA_1_9_1_BRANCH.
+# mozilla-central does not have this.
 MOZ_OJI=
-fi
 NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource"
 MOZ_IMG_DECODERS_DEFAULT=`echo "$MOZ_IMG_DECODERS_DEFAULT" | sed "s/ xbm//"`
 MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
 MOZ_STATIC_MAIL_BUILD=1
 MOZ_COMPOSER=1