Bug 664892 - Set --enable-application to mail by default and --enable-debug-symbols to on by default. r=KaiRo
authorSiddharth Agarwal <sid.bugzilla@gmail.com>
Mon, 20 Jun 2011 17:51:11 -0700
changeset 8205 8a5612882e86d21924d072d0ffed9d3ee1c6f97b
parent 8204 5d78f1886da8f797b2c723651e0858733eb942a6
child 8206 fbe40875d241b3d37712c70e7db870d339e11d28
push idunknown
push userunknown
push dateunknown
reviewersKaiRo
bugs664892, 644861, 636695
Bug 664892 - Set --enable-application to mail by default and --enable-debug-symbols to on by default. r=KaiRo This ports bug 644861 and bug 636695 respectively to comm-central.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4599,23 +4599,29 @@ if test -z "$XULRUNNER_STUB_NAME"; then
     XULRUNNER_STUB_NAME=xulrunner
     ;;
   *)
     XULRUNNER_STUB_NAME=xulrunner-stub
   esac
 fi
 AC_SUBST(XULRUNNER_STUB_NAME)
 
+AC_MSG_CHECKING([for application to build])
 if test -z "$MOZ_BUILD_APP"; then
-  AC_MSG_ERROR([--enable-application=APP was not specified and is required.])
+  AC_MSG_RESULT([mail])
+  echo "Building Thunderbird by default. Set --enable-application to build a different application."
+  MOZ_BUILD_APP=mail
 else
   # We have a valid application only if it has a build.mk file in its top
   # directory.
   if test ! -f "${srcdir}/${MOZ_BUILD_APP}/build.mk" ; then
+    AC_MSG_RESULT([none])
     AC_MSG_ERROR([--enable-application value not recognized (${MOZ_BUILD_APP}/build.mk does not exist).])
+  else
+    AC_MSG_RESULT([$MOZ_BUILD_APP])
   fi
 fi
 
 # Allow the application to influence configure with a confvars.sh script.
 
 AC_MSG_CHECKING([if app-specific confvars.sh exists])
 if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then
   AC_MSG_RESULT([${srcdir}/${MOZ_BUILD_APP}/confvars.sh])
@@ -5790,42 +5796,34 @@ fi
 fi # COMPILE_ENVIRONMENT
 
 AC_SUBST(MOZ_OPTIMIZE)
 AC_SUBST(MOZ_OPTIMIZE_FLAGS)
 AC_SUBST(MOZ_OPTIMIZE_LDFLAGS)
 AC_SUBST(MOZ_OPTIMIZE_SIZE_TWEAK)
 
 dnl ========================================================
-dnl = (Deprecated) generation of debugger info for specific modules
-dnl ========================================================
-MOZ_ARG_ENABLE_STRING(debugger-info-modules,
-[  --enable-debugger-info-modules
-                          Enable/disable debugger info for specific modules],
-[ if test "$enableval" != "no"; then
-    AC_MSG_WARN([--enable-debugger-info-modules is deprecated, use --enable-debug-symbols instead])
-    MOZ_DEBUG_SYMBOLS=1
-  fi ])
-
-dnl ========================================================
 dnl = Enable generation of debug symbols
 dnl ========================================================
 MOZ_ARG_ENABLE_STRING(debug-symbols,
 [  --enable-debug-symbols[=DBG]
                           Enable debugging symbols (using compiler flags DBG)],
 [ if test "$enableval" != "no"; then
       MOZ_DEBUG_SYMBOLS=1
       if test -n "$enableval" -a "$enableval" != "yes"; then
           if test -z "$_MOZ_DEBUG_FLAGS_SET"; then
               MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
           else
               AC_MSG_ERROR([--enable-debug-symbols flags cannot be used with --enable-debug flags])
           fi
       fi
-  fi ])
+  else
+      MOZ_DEBUG_SYMBOLS=
+  fi ],
+  MOZ_DEBUG_SYMBOLS=1)
 
 if test -n "$MOZ_DEBUG" -o -n "$MOZ_DEBUG_SYMBOLS"; then
     AC_DEFINE(MOZ_DEBUG_SYMBOLS)
     export MOZ_DEBUG_SYMBOLS
 fi
 
 dnl ========================================================
 dnl Disable runtime logging checks