[MOAB-dev] r4280 - in MOAB/trunk: . config

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-11-18 14:44:49 -0600 (Thu, 18 Nov 2010)
New Revision: 4280

Modified:
   MOAB/trunk/config/compiler.m4
   MOAB/trunk/configure.ac
Log:
enable silent build rules by default if configured with --enable-debug

Modified: MOAB/trunk/config/compiler.m4
===================================================================
--- MOAB/trunk/config/compiler.m4	2010-11-18 20:15:25 UTC (rev 4279)
+++ MOAB/trunk/config/compiler.m4	2010-11-18 20:44:49 UTC (rev 4280)
@@ -120,6 +120,7 @@
 #
 #  CFLAGS   - C compiler flags
 #  CXXFLAGS - C++ compiler flags
+#  DEBUG - yes if specified, no otherwise
 #
 #######################################################################################
 AC_DEFUN([FATHOM_COMPILER_FLAGS], [
@@ -159,6 +160,7 @@
 
 # Do enable_optimize by default, unless user has specified
 # custom CXXFLAGS or CFLAGS
+DEBUG=no
 if test "x$enable_debug" = "x"; then
   if test "x$enable_cxx_optimize" = "x"; then
     if test "x$USER_CXXFLAGS" = "x"; then
@@ -179,6 +181,7 @@
 
 # Choose compiler flags from CLI args
 if test "xyes" = "x$enable_debug"; then
+  DEBUG=yes
   CXXFLAGS="$CXXFLAGS -g"
   CFLAGS="$CFLAGS -g"
   FCFLAGS="$FCFLAGS -g"

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2010-11-18 20:15:25 UTC (rev 4279)
+++ MOAB/trunk/configure.ac	2010-11-18 20:44:49 UTC (rev 4280)
@@ -7,7 +7,7 @@
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_SYSTEM
 m4_ifdef([AM_SILENT_RULES],
- [AM_INIT_AUTOMAKE([silent-rules color-tests parallel-tests])],
+ [AM_INIT_AUTOMAKE([color-tests parallel-tests])],
  [AM_INIT_AUTOMAKE])
 
 AC_CHECK_PROG( [SED], [sed], [sed], [true] )
@@ -31,7 +31,15 @@
 AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
 FATHOM_COMPILER_FLAGS
+m4_ifdef([AM_SILENT_RULES],[
+if test "x$DEBUG" = "xyes"; then
+  AM_SILENT_RULES(yes)
+else
+  AM_SILENT_RULES(no)