X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=63efb05ff93c00e6ef401841dc641377ebf8324d;hb=cabc5359e111e9d8a9554263ece8e51d8de1ef86;hp=947c97653dffa554bb704a8a286a73d7219e525f;hpb=949b7c917af311cd38f911bc5d0af36f524a6086;p=ctsim.git

diff --git a/configure.in b/configure.in
index 947c976..63efb05 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.8)
+AM_INIT_AUTOMAKE(ctsim,2.0.0-b1)
 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
+AC_PROG_CC([-g])
 AC_PROG_CXX
 
 
@@ -80,6 +80,7 @@ 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])
@@ -137,18 +138,22 @@ 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"
+       CFLAGS="-g -DDEBUG"
+       AC_MSG_RESULT(yes)
        ;;
   no)  debug=false 
-       CFLAGS="$CFLAGS -O2"
+       AC_MSG_RESULT(no)
+       CFLAGS="-g -O"
        ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) 
+  *) AC_MSG_RESULT([bad value ${enableval} for --enable-debug]) 
        ;;
-esac],[debug=false])
+esac],
+[debug=false])
 AM_CONDITIONAL(DEBUG, test "$debug" = "true")
 
 dnl Set LAM path
@@ -305,6 +310,10 @@ 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"