bug 516758 bustage fix followup, replace some logic in configure
authorTed Mielczarek <ted.mielczarek@gmail.com>
Wed, 31 Mar 2010 07:10:09 -0400
changeset 40036 aea2b08ae4a33794d678842497de6ddc0bcc6018
parent 40035 f95fc26312b8c277235354e536e5589c9c6d9a4a
child 40037 71de58dcfb527c002f9b158a50b8509bac4ad8c9
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs516758
milestone1.9.3a4pre
bug 516758 bustage fix followup, replace some logic in configure
configure.in
--- a/configure.in
+++ b/configure.in
@@ -6302,16 +6302,28 @@ AC_SUBST(MOZ_DISABLE_PARENTAL_CONTROLS)
 dnl ========================================================
 dnl =
 dnl = Module specific options
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Individual module options)
 
 dnl ========================================================
+dnl = Places, no configure argument
+dnl ========================================================
+if test -n "$MOZ_PLACES"; then
+    AC_DEFINE(MOZ_PLACES)
+    if test -z "$MOZ_MAIL_NEWS"; then
+      MOZ_MORK=
+    fi
+    MOZ_MORKREADER=1
+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)