r7939: Initial working version of fftw3 conversion -- tested only with pjrec

[ctsim.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e9f4c40389fa97e3115bb88eedd10303a38062fc..2ce392d076a09af503a529cc2e2accbd03bc9c69 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl CDPATH=
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
 AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE(ctsim,4.2.6)
+AM_INIT_AUTOMAKE(ctsim,4.3.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -43,8 +43,8 @@ AC_CHECK_LIB(readline, main, [readline=true;
 wxwin=false
 AC_CHECK_LIB(wx_gtk-2.4, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
 AC_CHECK_LIB(wx_mac-2.4, main, [wxwin=true; wx_mac=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
-AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false])
-AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -lXt -lXext])
+AC_CHECK_LIB(fftw3, fftw_malloc, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false])
+AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -L/usr/X11R6/lib64 -lXt -lXext])
 AC_CHECK_LIB(pthread, main, [pthread=true], [pthread=false])
 
 if test "$zlib" = "true" ; then
@@ -84,7 +84,7 @@ if test "${getopt_long}" = "false" ; then
   LDFLAGS="$LDFLAGS -L../getopt"
   GETOPTLONG=1
 fi
-AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test $GETOPTLONG==1)
+AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test "$GETOPTLONG"="1")
 
 if test "${readline}" = "true" ; then
   ctlibs_base="$ctlibs_base -lreadline"
@@ -346,7 +346,7 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib"
 AC_MSG_CHECKING([for X])
 if test "$no_x" != "yes" ; then
   AC_DEFINE(HAVE_X11,1,[X11 system])
-  LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
+  LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib -L/usr/X11R6/lib64"
   my_includes="$my_includes -I/usr/X11R6/include"
   ctlib_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
@@ -364,12 +364,13 @@ if test "$no_x" != "yes" ; then
   fi
   if test "$wxwin" = "true" ; then
     AC_DEFINE(HAVE_SGP,1,[use sgp library])
-    AM_CONDITIONAL(HAVE_SGP, test 1==1)
   fi
 else
   AC_MSG_RESULT(no)
 fi
 
+AM_CONDITIONAL(HAVE_SGP, test "$wxwin" = "true")
+
 if test "$png" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lpng"
 fi
@@ -377,7 +378,7 @@ if test "$zlib" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lz"
 fi
 if test "$fftw" = "true" ; then
-  ctlibs_tools="$ctlibs_tools -lrfftw -lfftw"
+  ctlibs_tools="$ctlibs_tools -lfftw3"
 fi
 if test "$ctn" = "true"; then
   ctlibs_tools="$ctlibs_tools -lctn"
@@ -439,10 +440,10 @@ if test "$wxwin" = "true" ; then
   fi
   CFLAGS="$CFLAGS -I../include $wxcflags"
   ctlib_graphics="$ctlib_graphics $wxlibs"
-  AM_CONDITIONAL(HAVE_WXWINDOWS, test 1==1 )
 fi
 AC_SUBST(wxcflags)
 AC_SUBST(wxlibs)
+AM_CONDITIONAL(HAVE_WXWINDOWS, test "$wxwin"="true")
 
 dnl Setting projet libraries and includes
 LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim"