X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure;h=c977cf2d4f035641a2167fad4f9d7cf87e6af306;hp=f907e39a1cc44f0e2b35aa5f2a48f331595a6515;hb=ff6b0481fccb03123aa9cc1807f4ff5508efc190;hpb=ffdfebd7a79cd12a4fcab065a590ffb7f8ebde98

diff --git a/configure b/configure
index f907e39..c977cf2 100755
--- a/configure
+++ b/configure
@@ -1600,7 +1600,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=ctsim
- VERSION=4.2.8
+ VERSION=4.3.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6454,13 +6454,13 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for fftw_one in -lfftw" >&5
-echo $ECHO_N "checking for fftw_one in -lfftw... $ECHO_C" >&6
-if test "${ac_cv_lib_fftw_fftw_one+set}" = set; then
+echo "$as_me:$LINENO: checking for fftw_malloc in -lfftw3" >&5
+echo $ECHO_N "checking for fftw_malloc in -lfftw3... $ECHO_C" >&6
+if test "${ac_cv_lib_fftw3_fftw_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfftw  $LIBS"
+LIBS="-lfftw3  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -6475,11 +6475,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char fftw_one ();
+char fftw_malloc ();
 int
 main ()
 {
-fftw_one ();
+fftw_malloc ();
   ;
   return 0;
 }
@@ -6496,19 +6496,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_fftw_fftw_one=yes
+  ac_cv_lib_fftw3_fftw_malloc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_fftw_fftw_one=no
+ac_cv_lib_fftw3_fftw_malloc=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_fftw_fftw_one" >&5
-echo "${ECHO_T}$ac_cv_lib_fftw_fftw_one" >&6
-if test $ac_cv_lib_fftw_fftw_one = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_fftw3_fftw_malloc" >&5
+echo "${ECHO_T}$ac_cv_lib_fftw3_fftw_malloc" >&6
+if test $ac_cv_lib_fftw3_fftw_malloc = yes; then
   fftw=true;
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_FFTW 1
@@ -6524,7 +6524,7 @@ if test "${ac_cv_lib_GL_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL -L/usr/X11R6/lib -lXt -lXext $LIBS"
+LIBS="-lGL -L/usr/X11R6/lib -L/usr/X11R6/lib64 -lXt -lXext $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -7453,7 +7453,13 @@ done
 
 
 
-for ac_func in strtod strtol snprintf htonl usleep vsprintf vsnprintf
+
+
+
+
+
+
+for ac_func in strtod strtol snprintf htonl usleep vsprintf vsnprintf basename setjmp setpriority time gettimeofday getenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -9718,7 +9724,7 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_X11 1
 _ACEOF
 
-  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"
   echo "$as_me:$LINENO: result: yes" >&5
@@ -9765,7 +9771,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"