r142: *** empty log message ***

[ctsim.git] / configure.in

diff --git a/configure.in b/configure.in
index b63f09ad59d2db3fa8ec39209cda7eb053edb208..e3ea013d03db779b9419bfdfa1b05f46779242a3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,8 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
-AC_INIT(src/ctrec.cpp)
-AM_INIT_AUTOMAKE(ctsim,1.9.3)
+AC_INIT(src/pjrec.cpp)
+AM_INIT_AUTOMAKE(ctsim,2.0.0-b3)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -79,6 +79,8 @@ AC_CHECK_LIB(ncurses, main, [ncurses=true], [ncurses=false])
 AC_CHECK_LIB(g2, main, [g2=true], [g2=false])
 AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)], [wxwin=false])
 AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)], [wxwin=false])
+AC_CHECK_LIB(dmallocxx, main, [dmalloc=true], [dmalloc=false])
+AC_CHECK_LIB(fftw, main, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
 
 if test "$zlib" = "true" ; then
   AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
@@ -86,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
@@ -112,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,
@@ -136,20 +137,30 @@ AC_ARG_ENABLE(verbose-warnings,
 )
 
 dnl Check for debug mode
+AC_MSG_CHECKING([debug])
 AC_ARG_ENABLE(debug,
 [  --enable-debug          Turn on debugging],
 [case "${enableval}" in
   yes) debug=true 
-       CFLAGS="$CFLAGS -g"
+       AC_MSG_RESULT(yes)
        ;;
   no)  debug=false 
-       CFLAGS="$CFLAGS -O2"
+       AC_MSG_RESULT(no)
        ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) 
+  *) AC_MSG_RESULT([bad value ${enableval} for --enable-debug]) 
        ;;
-esac],[debug=false])
+esac],
+[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 ],
@@ -304,14 +315,18 @@ if test "$wx_gtk" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lwx_gtk"
 fi
 
+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)
 
 if test -n "$lamdir" ; then
-  lamprograms="ctrec-lam phm2if-lam phm2pj-lam"
+  lamprograms="pjrec-lam phm2if-lam phm2pj-lam"
   AC_SUBST(lamprograms)
 fi
 
-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 src/sample-ctrec.sh cgi-bin/ctsim.conf)
+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 src/sample-ctsim.sh cgi-bin/ctsim.conf)