X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=configure;h=3668003b2cfe88479c47bc0bfa82a647c4f315b8;hb=3998160a07b7885b0650699113f5cd7bde1e3a0c;hp=fc903ac365fc309e98482658ae1dc2b4287aa8c4;hpb=5de81048494731a2879f3145517af82722c98f83;p=ctsim.git

diff --git a/configure b/configure
index fc903ac..3668003 100755
--- a/configure
+++ b/configure
@@ -308,7 +308,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE wxconfig build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPP EGREP INCLUDED_GETOPT_LONG_TRUE INCLUDED_GETOPT_LONG_FALSE DEBUG_TRUE DEBUG_FALSE lamdir mpienable cgibindir cgibinurl webdatadir webdataurl htmldir cgiprograms htmldata USE_HTML_TRUE USE_HTML_FALSE webenabled USE_LAM_TRUE USE_LAM_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_TOOLKIT_LIBS X_BASIC_LIBS NO_X_TRUE NO_X_FALSE my_includes HAVE_SGP_TRUE HAVE_SGP_FALSE HAVE_WXWINDOWS_TRUE HAVE_WXWINDOWS_FALSE wxcflags wxlibs ctlibs lamprograms lamdefs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE wxconfig build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPP EGREP INCLUDED_GETOPT_LONG_TRUE INCLUDED_GETOPT_LONG_FALSE DEBUG_TRUE DEBUG_FALSE lamdir mpienable cgibindir cgibinurl webdatadir webdataurl htmldir cgiprograms htmldata USE_HTML_TRUE USE_HTML_FALSE webenabled USE_LAM_TRUE USE_LAM_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_TOOLKIT_LIBS X_BASIC_LIBS NO_X_TRUE NO_X_FALSE my_includes HAVE_SGP_TRUE HAVE_SGP_FALSE wxcflags wxlibs HAVE_WXWINDOWS_TRUE HAVE_WXWINDOWS_FALSE ctlibs lamprograms lamdefs LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1600,7 +1600,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=ctsim
- VERSION=4.2.6
+ 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.  */
@@ -7979,6 +7979,79 @@ else
    getopt=false
 fi
 
+echo "$as_me:$LINENO: checking for getenv" >&5
+echo $ECHO_N "checking for getenv... $ECHO_C" >&6
+if test "${ac_cv_func_getenv+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char getenv (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+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 getenv ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_getenv) || defined (__stub___getenv)
+choke me
+#else
+char (*f) () = getenv;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != getenv;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_getenv=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_getenv=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_getenv" >&5
+echo "${ECHO_T}$ac_cv_func_getenv" >&6
+
 
 if test "${OSTYPE}" = "cygwin" ; then
   getopt_long=false
@@ -8076,7 +8149,7 @@ _ACEOF
 fi
 
 
-if test $GETOPTLONG==1; then
+if test "$GETOPTLONG"="1"; then
   INCLUDED_GETOPT_LONG_TRUE=
   INCLUDED_GETOPT_LONG_FALSE='#'
 else
@@ -9718,7 +9791,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
@@ -9741,9 +9814,15 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_SGP 1
 _ACEOF
 
+  fi
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
 
 
-if test 1==1; then
+if test "$wxwin" = "true"; then
   HAVE_SGP_TRUE=
   HAVE_SGP_FALSE='#'
 else
@@ -9751,11 +9830,6 @@ else
   HAVE_SGP_FALSE=
 fi
 
-  fi
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
 
 if test "$png" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lpng"
@@ -9764,7 +9838,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"
@@ -9956,9 +10030,12 @@ if test "$wxwin" = "true" ; then
   fi
   CFLAGS="$CFLAGS -I../include $wxcflags"
   ctlib_graphics="$ctlib_graphics $wxlibs"
+fi
+
+
 
 
-if test 1==1 ; then
+if test "$wxwin"="true"; then
   HAVE_WXWINDOWS_TRUE=
   HAVE_WXWINDOWS_FALSE='#'
 else
@@ -9966,9 +10043,6 @@ else
   HAVE_WXWINDOWS_FALSE=
 fi
 
-fi
-
-
 
 LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim"
 ctlibs="$ctlibs_base -lctsim $ctlib_graphics -lctsupport $ctlibs_tools"
@@ -10787,10 +10861,10 @@ s,@NO_X_FALSE@,$NO_X_FALSE,;t t
 s,@my_includes@,$my_includes,;t t
 s,@HAVE_SGP_TRUE@,$HAVE_SGP_TRUE,;t t
 s,@HAVE_SGP_FALSE@,$HAVE_SGP_FALSE,;t t
-s,@HAVE_WXWINDOWS_TRUE@,$HAVE_WXWINDOWS_TRUE,;t t
-s,@HAVE_WXWINDOWS_FALSE@,$HAVE_WXWINDOWS_FALSE,;t t
 s,@wxcflags@,$wxcflags,;t t
 s,@wxlibs@,$wxlibs,;t t
+s,@HAVE_WXWINDOWS_TRUE@,$HAVE_WXWINDOWS_TRUE,;t t
+s,@HAVE_WXWINDOWS_FALSE@,$HAVE_WXWINDOWS_FALSE,;t t
 s,@ctlibs@,$ctlibs,;t t
 s,@lamprograms@,$lamprograms,;t t
 s,@lamdefs@,$lamdefs,;t t