Changeset 02bc3c for pcp/configure.ac

Timestamp:

Jun 7, 2008, 1:16:19 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

1f4209

Parents:

79290f

Message:

new aclocal macro with controles all the enable-debug/optimization/warning in a unified manner and still keeps packages independent of each other.

Note that Ralf suggested specifying optimizations in CFLAGS directly, due to the load of activateable warnings, i saw it rather fit to make such a configure option.

File:

• pcp/configure.ac (modified) (7 diffs)

pcp/configure.ac

@@ -12 +12 @@
 AC_CANONICAL_HOST
 
+if test x"$CFLAGS" = x; then
+        CFLAGS_empty=1
+else
+        CFLAGS_empty=0
+fi
+if test x"$CXXFLAGS" = x; then
+        CXXFLAGS_empty=1
+else
+        CXXFLAGS_empty=0
+fi
+
 # Checks for programs.
 AC_PROG_CC
@@ -18 +29 @@
 AC_PATH_PROG([TAR],[tar])
 AM_MISSING_PROG([DOXYGEN], [doxygen])
+
+# Resetting C(XX)FLAGS again
+if test $CFLAGS_empty -eq 1; then
+        CFLAGS=""
+fi
+if test $CXXFLAGS_empty -eq 1; then
+        CXXFLAGS=""
+fi
+
 
 dnl Check for MPI-Routines
@@ -43 +63 @@
                 AC_ARG_VAR([MPICXX],[necessary comnpiler for MPI CPP code])
                 #AM_CONDITIONAL([MPIVER], [test x"$enable_mpi" = xyes])
-                AC_MSG_WARN(["MPICC: $MPICC, MPILIBS: $MPILIBS, MPIVER: $MPIVER, CC: $CC"])
+                AC_MSG_NOTICE(["MPICC: $MPICC, MPILIBS: $MPILIBS, MPIVER: $MPIVER, CC: $CC"])
                 # if CC not set, set to MPICC
                 if ! test x"$MPICC" = x; then
@@ -61 +81 @@
         AC_MSG_NOTICE([$disabled_msg])
 fi
+
+AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[debugging level of compiler. Argument is yes or debugging level. (default is no)]),
+              [enable_debugging=$enableval], [enable_debugging=no])
+AC_ARG_ENABLE([optimization],AS_HELP_STRING([--enable-optimization],[Optimization level of compiler. Argument is yes or optimization. (default is 2)]),
+              [enable_optimization=$enableval], [enable_optimization=2])
+AC_ARG_ENABLE([warnings], AS_HELP_STRING([--enable-warnings],[Output compiler warnings, argument is none, some or full (default is some).]),
+              [enable_warnings=$enableval], [enable_warnings=some])
+AC_SET_COMPILER_FLAGS([$enable_optimization], [$enable_debugging], [$enable_warnings])
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -93 +121 @@
               [enable_fftw3=$enableval], [enable_fftw3=maybe])
               
-# debugging info
-AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Output debugging information, argument is yes or debugging level (default is no).]),
-              [enable_debug=$enableval], [enable_debug=no])
-if ! test x"$enable_debug" = xno; then
-        if test x"${enable_debug}" = xyes; then
-                CFLAGS="$CFLAGS -g3"
-                CXXFLAGS="$CXXFLAGS -g3"
-        else
-                CFLAGS="$CFLAGS -g${enable_debug}"
-                CXXFLAGS="$CXXFLAGS -g${enable_debug}"
-        fi
-        dnl enable all warnings
-        CFLAGS="$CFLAGS -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -Wshadow -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -Wredundant-decls -Wnested-externs -Wmissing-noreturn -Wformat-security -Wmissing-format-attribute -Winit-self"
-        CXXFLAGS="$CXXFLAGS -Wall -W -Wshadow -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -Wredundant-decls -Wmissing-noreturn -Wformat-security -Wmissing-format-attribute -Winit-self"
-  AC_DEFINE(HAVE_DEBUG,1, ["Output debugging info"])
-  AC_SUBST(HAVE_DEBUG)
-else
-        dnl even without debugging we want some minimal info of something's utterly wrong
-        CFLAGS="$CFLAGS -Wall"
-        CXXFLAGS="$CXXFLAGS -Wall"
-fi
-
-# optimization level
-AC_ARG_ENABLE([optimization],AS_HELP_STRING([--enable-optimization],[Optimization level of compiler. Argument is yes or debugging level. (default is 2)]),
-              [enable_optimization=$enableval], [enable_optimization=yes])
-if ! test x"$enable_optimization" = xno; then
-        if test x"$enable_debug" = xno; then
-                if test x"${enable_optimization}" = xyes; then
-                        CFLAGS="$CFLAGS -O2"
-                        CXXFLAGS="$CXXFLAGS -O2"
-                else
-                        CFLAGS="$CFLAGS -O${enable_optimization}"
-                        CXXFLAGS="$CXXFLAGS -O${enable_optimization}"
-                fi
-        #else
-                #AC_MSG_WARN(["Already specified --enable-debug!"])
-        fi
-fi
-
 # Checks for header files.
 AC_HEADER_STDC
@@ -179 +168 @@
 # check for GNU Scientific Library
 #AC_CHECK_LIB(m,main)
+AC_CHECK_HEADERS([gsl/gsl_blas.h])
 AC_SEARCH_LIBS(cblas_sdot, blas cblas gslblas gslcblas)
 AC_CHECK_LIB(gsl, main)
@@ -199 +189 @@
 fi
 
+AC_MSG_NOTICE(["CFLAGS: $CFLAGS, CXXFLAGS: $CXXFLAGS, LDFLAGS: $LDFLAGS, CC: $CC, CXX:, $CXX, MPICC: $MPICC, MPILIBS: $MPILIBS, LIBS: $LIBS"])
+
 # test suite
 AC_CONFIG_TESTDIR(tests)