Bug 556256 Explicitly set MOZ_MORKREADER and MOZ_MORK for Thunderbird and SeaMonkey, and sync enable places changes from bug 516758. r=Callek
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 01 Apr 2010 16:42:06 +0100
changeset 5349 3179601351f15619f914cfb2d87cc9020c8701c0
parent 5348 0d37fec983676b139487b4e53f3f1ff4d139b87c
child 5350 765aed3bfca289cb2707bb4c4f1d5d8511335a79
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs556256, 516758
Bug 556256 Explicitly set MOZ_MORKREADER and MOZ_MORK for Thunderbird and SeaMonkey, and sync enable places changes from bug 516758. r=Callek
configure.in
mail/confvars.sh
suite/confvars.sh
--- a/configure.in
+++ b/configure.in
@@ -4518,30 +4518,30 @@ MOZ_DBGRINFO_MODULES=
 MOZ_FEEDS=1
 if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
 MOZ_IPC=1
 fi
 MOZ_JSDEBUGGER=1
 MOZ_JSLOADER=1
 MOZ_LDAP_XPCOM=
 MOZ_MAIL_NEWS=
-MOZ_MORK=1
-MOZ_MORKREADER=
+MOZ_MORK=
+MOZ_MORKREADER=1
 MOZ_AUTH_EXTENSION=1
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_NO_INSPECTOR_APIS=
 MOZ_NO_FAST_LOAD=
 MOZ_OGG=1
 MOZ_SYDNEYAUDIO=
 MOZ_WAVE=1
 if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
 MOZ_PANGO=1
 fi
 MOZ_PERMISSIONS=1
-MOZ_PLACES=
+MOZ_PLACES=1
 MOZ_PLAINTEXT_EDITOR_ONLY=
 MOZ_PLUGINS=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_PROFILELOCKING=1
 MOZ_PSM=1
 MOZ_RDF=1
 MOZ_SAFE_BROWSING=
 MOZ_FASTSTART=
@@ -4654,17 +4654,16 @@ minimal)
   MOZ_NO_INSPECTOR_APIS=1
   MOZ_NO_FAST_LOAD=1
   MOZ_PLAINTEXT_EDITOR_ONLY=1
   MOZ_PLUGINS=
   MOZ_PREF_EXTENSIONS=
   MOZ_PROFILELOCKING=
   MOZ_SPELLCHECK=
   MOZ_STORAGE=1
-  MOZ_PLACES=
   if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
   MOZ_SVG=
   fi
   MOZ_UNIVERSALCHARDET=
   MOZ_UPDATER=
   MOZ_USE_NATIVE_UCONV=1
   MOZ_VIEW_SOURCE=
   MOZ_XPINSTALL=
@@ -5655,35 +5654,16 @@ MOZ_ARG_ENABLE_BOOL(xpcom-lea,
 [  --enable-xpcom-lea      Use Lea malloc in xpcom ],
     XPCOM_USE_LEA=1,
     XPCOM_USE_LEA= )
 if test -n "$XPCOM_USE_LEA"; then
     AC_DEFINE(XPCOM_USE_LEA)
 fi
 
 dnl ========================================================
-dnl = Enable places (new history/bookmarks)
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(places,
-[  --enable-places        Enable 'places' bookmark/history implementation],
-    MOZ_PLACES=1,
-    MOZ_PLACES= )
-if test -n "$MOZ_PLACES"; then
-    AC_DEFINE(MOZ_PLACES)
-    if test -z "$MOZ_MAIL_NEWS"; then
-      MOZ_MORK=
-    fi
-    MOZ_MORKREADER=1
-else
-  if test "$MOZ_BUILD_APP" = "browser"; then
-    AC_MSG_ERROR([Cannot build Firefox with --disable-places.])
-  fi
-fi
-
-dnl ========================================================
 dnl = Disable feed handling components
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(feeds,
 [  --disable-feeds        Disable feed handling and processing components],
     MOZ_FEEDS=,
     MOZ_FEEDS=1 )
 if test -n "$MOZ_FEEDS"; then
     AC_DEFINE(MOZ_FEEDS)
@@ -7002,16 +6982,21 @@ if test "$MOZ_MORK"; then
 fi
 
 dnl Build the lightweight Mork reader if required
 AC_SUBST(MOZ_MORKREADER)
 if test "$MOZ_MORKREADER"; then
   AC_DEFINE(MOZ_MORKREADER)
 fi
 
+AC_SUBST(MOZ_PLACES)
+if test "$MOZ_PLACES"; then
+  AC_DEFINE(MOZ_PLACES)
+fi
+
 dnl ========================================================
 if test "$MOZ_DEBUG" || test "$NS_TRACE_MALLOC"; then
     MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
 fi
 
 if test "$MOZ_LDAP_XPCOM"; then
     LDAP_CFLAGS='-I${DIST}/public/ldap'
     if test "$OS_ARCH" = "WINNT"; then
@@ -7087,17 +7072,16 @@ AC_SUBST(MOZ_INSURE_DIRS)
 AC_SUBST(MOZ_INSURE_EXCLUDE_DIRS)
 AC_SUBST(MOZ_QUANTIFY)
 AC_SUBST(MOZ_INSURIFYING)
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(MOZ_LDAP_XPCOM_EXPERIMENTAL)
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
 AC_SUBST(LIBICONV)
-AC_SUBST(MOZ_PLACES)
 AC_SUBST(MOZ_PLACES_BOOKMARKS)
 AC_SUBST(MOZ_STORAGE)
 AC_SUBST(MOZ_FEEDS)
 AC_SUBST(NS_PRINTING)
 
 AC_SUBST(MOZ_PROFILELOCKING)
 
 AC_SUBST(XPCOM_USE_LEA)
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -46,16 +46,18 @@ MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
 MOZ_STATIC_MAIL_BUILD=1
 MOZ_COMPOSER=1
 MOZ_SAFE_BROWSING=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_PLACES=
+MOZ_MORKREADER=
+MOZ_MORK=1
 
 # Needed for the mozilla-central build side of the system.
 # Can be dropped when we branch MOZILLA_1_9_2_BRANCH
 MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\.[0-9]\).*/\1/;'`
 
 if test "$MOZILLA_BRANCH_VERSION" = "1.9.2"; then
   MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version-192.txt
   # Use unofficial branding for the 1.9.2 branch
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -45,17 +45,17 @@ fi
 MOZ_STATIC_MAIL_BUILD=1
 MOZ_COMPOSER=1
 MOZ_SUITE=1
 MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
 SEAMONKEY_VERSION=$MOZ_APP_VERSION
 MOZ_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs reporter"
-MOZ_PLACES=1
 MOZ_UPDATER=1
 MOZ_HELP_VIEWER=1
 MOZ_TOOLKIT_SEARCH=
+MOZ_MORK=1
 
 # Disable libxul which is (now) the default on mozilla-central. (Bug 394502)
 MOZ_ENABLE_LIBXUL=
 # Until we can build with libxul, we can't have ipc either. (Bug 531292)
 MOZ_IPC=