X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=e3ea013d03db779b9419bfdfa1b05f46779242a3;hb=1fd4f7cc977b9f1499716de10d15656bd50f4816;hp=e96baa4b3eb4b167108b0b9df81616e4fdf97c6d;hpb=a8ba12a8c971de1d8cb3ef1c3a7d2d9fcf45affa;p=ctsim.git

diff --git a/configure.in b/configure.in
index e96baa4..e3ea013 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
 AC_INIT(src/pjrec.cpp)
-AM_INIT_AUTOMAKE(ctsim,1.9.9)
+AM_INIT_AUTOMAKE(ctsim,2.0.0-b3)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -12,7 +12,7 @@ AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
-AC_PROG_CC([-g])
+AC_PROG_CC
 AC_PROG_CXX
 
 
@@ -88,7 +88,7 @@ fi
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -114,7 +114,6 @@ if test "${getopt_long}" = "false" ; then
   AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1)
 fi
 
-
 AC_ADD_GCC_CFLAGS([-Wall])
 AC_MSG_CHECKING(whether to enable verbose warnings)
 AC_ARG_ENABLE(verbose-warnings,
@@ -143,19 +142,25 @@ AC_ARG_ENABLE(debug,
 [  --enable-debug          Turn on debugging],
 [case "${enableval}" in
   yes) debug=true 
-       CFLAGS="-g -DDEBUG"
        AC_MSG_RESULT(yes)
        ;;
   no)  debug=false 
        AC_MSG_RESULT(no)
-       CFLAGS="-g -O"
        ;;
   *) AC_MSG_RESULT([bad value ${enableval} for --enable-debug]) 
        ;;
 esac],
-[debug=false])
+[debug=false; AC_MSG_RESULT(no)])
 AM_CONDITIONAL(DEBUG, test "$debug" = "true")
 
+if test "$debug" = "true" ; then
+  AC_ADD_GCC_CFLAGS([-g -DDEBUG])
+  AC_DEFINE(DEBUG)
+else
+  AC_ADD_GCC_CFLAGS([-g -O3 -DNDEBUG --fast-math])
+  AC_DEFINE(NDEBUG)
+fi
+
 dnl Set LAM path
 AC_ARG_WITH(lam,
 [  --with-lam[=PATH]       Set path of LAM MPI ],