r164: *** empty log message ***

[ctsim.git] / configure.in

diff --git a/configure.in b/configure.in
index 7c27a3e1dc58d18e6516834f9e49de4f62ae72fc..153bd9471a20bf25a9881abaf3acf6d22f8172f9 100644 (file)
--- 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/ctsim.cpp)
-AM_INIT_AUTOMAKE(ctsim,2.0.0-b4)
+AM_INIT_AUTOMAKE(ctsim,2.0.0-b8)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -80,7 +80,7 @@ AC_CHECK_LIB(g2, main, [g2=true], [g2=false])
 wxwin=false
 AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
 AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
-AC_CHECK_LIB(dmallocxx, main, [dmalloc=true], [dmalloc=false])
+AC_CHECK_LIB(hdf5, main, [hdf5=true], [hdf5=false], -lz)
 AC_CHECK_LIB(fftw, main, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
 
 if test "$zlib" = "true" ; then
@@ -115,28 +115,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,
-[  --enable-verbose-warnings
-                          Enable verbose compiler warnings.],
-[ case "$enableval" in
-  yes)
-    AC_MSG_RESULT(yes)
-    AC_ADD_GCC_CFLAGS([-W])
-    AC_ADD_GCC_CFLAGS([-Wshadow -Wpointer-arith -Wbad-function-cast])
-    AC_ADD_GCC_CFLAGS([-Wcast-align -Wwrite-strings -Waggregate-return])
-    AC_ADD_GCC_CFLAGS([-Wmissing-prototypes -Wstrict-prototypes])
-    AC_ADD_GCC_CFLAGS([-pedantic])
-    AC_ADD_GCC_CFLAGS([-Wredundant-decls])
-
-    ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-  esac ], AC_MSG_RESULT(no)
-)
-
 dnl Check for debug mode
 AC_MSG_CHECKING([debug])
 AC_ARG_ENABLE(debug,
@@ -155,13 +133,38 @@ esac],
 AM_CONDITIONAL(DEBUG, test "$debug" = "true")
 
 if test "$debug" = "true" ; then
-  AC_ADD_GCC_CFLAGS([-g -DDEBUG])
+dnl  AC_ADD_GCC_CFLAGS([-g -DDEBUG])
+  CFLAGS="-g -DDEBUG"
   AC_DEFINE(DEBUG)
 else
-  AC_ADD_GCC_CFLAGS([-g -O3 -DNDEBUG --fast-math])
+dnl  AC_ADD_GCC_CFLAGS([-g -O2 -DNDEBUG])
+  CFLAGS="-g -O3 -DNDEBUG"
   AC_DEFINE(NDEBUG)
 fi
 
+
+AC_ADD_GCC_CFLAGS([-Wall])
+AC_MSG_CHECKING(whether to enable verbose warnings)
+AC_ARG_ENABLE(verbose-warnings,
+[  --enable-verbose-warnings
+                          Enable verbose compiler warnings.],
+[ case "$enableval" in
+  yes)
+    AC_MSG_RESULT(yes)
+    AC_ADD_GCC_CFLAGS([-W])
+    AC_ADD_GCC_CFLAGS([-Wshadow -Wpointer-arith -Wbad-function-cast])
+    AC_ADD_GCC_CFLAGS([-Wcast-align -Wwrite-strings -Waggregate-return])
+    AC_ADD_GCC_CFLAGS([-Wmissing-prototypes -Wstrict-prototypes])
+    AC_ADD_GCC_CFLAGS([-pedantic])
+    AC_ADD_GCC_CFLAGS([-Wredundant-decls])
+
+    ;;
+  *)
+    AC_MSG_RESULT(no)
+    ;;
+  esac ], AC_MSG_RESULT(no)
+)
+
 dnl Set LAM path
 AC_ARG_WITH(lam,
 [  --with-lam[=PATH]       Set path of LAM MPI ],
@@ -317,21 +320,44 @@ if test "$fftw" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lrfftw -lfftw"
 fi
 
-dnl Setting projet libraries and includes
-LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" 
-ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools"
-AC_SUBST(ctlibs)
+dnl Check for dmalloc
+AC_CHECK_LIB(dmallocxx, main, [dmallocxx=true], [dmallocxx=false])
+AC_MSG_CHECKING([for enable-dmalloc])
+AC_ARG_ENABLE(dmalloc,
+[  --enable-dmalloc        Use dmalloc memory allocation],
+[case "${enableval}" in
+  yes) usedmalloc=true 
+       AC_MSG_RESULT(yes)
+       ;;
+  no)  usedmalloc=false 
+       AC_MSG_RESULT(no)
+       ;;
+  *) AC_MSG_RESULT([bad value ${enableval} for --enable-dmalloc]) 
+       ;;
+esac],
+[usedmalloc=false; AC_MSG_RESULT(no)])
+
+if test "$dmallocxx" = "true" -a "$usedmalloc" = "true" ; then
+  ctlibs_tools="$ctlibs_tools -ldmallocxx"
+  AC_DEFINE(HAVE_DMALLOC)
+  AC_MSG_RESULT(Using dmalloc)
+fi
 
 if test "$wxwin" = "true" ; then
   wxcflags=`$wxconfig --cflags`
   CFLAGS="$CFLAGS -I../include $wxcflags"
   wxlibs=`$wxconfig --libs`
-  wxlibs="$wxlibs $ctlibs"
+  ctlibs_graphics="$ctlibs_graphics $wxlibs"
   AM_CONDITIONAL(HAVE_WXWINDOWS, test 1==1 )
 fi
 AC_SUBST(wxcflags)
 AC_SUBST(wxlibs)
 
+dnl Setting projet libraries and includes
+LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" 
+ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools"
+AC_SUBST(ctlibs)
+
 if test -n "$lamdir" ; then
   lamprograms="pjrec-lam phm2if-lam phm2pj-lam"
   AC_SUBST(lamprograms)
@@ -339,4 +365,4 @@ fi
 
 CXXFLAGS="$CFLAGS"
 
-AC_OUTPUT(Makefile src/Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile)
+AC_OUTPUT(Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile)