X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure;h=5b29fef37b19fe409f8f64d0e73a95228b6b2af6;hp=881c7bff29be195ecfe5bfbdae4f25a5b26a6b06;hb=1c68e2d8625a204f71150887616ea73a7546874a;hpb=5efcf294a51fae2c2814a1f265ea8a818604c716 diff --git a/configure b/configure index 881c7bf..5b29fef 100755 --- a/configure +++ b/configure @@ -308,7 +308,7 @@ ac_includes_default="\ # include #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.3 + VERSION=4.3.1 cat >>confdefs.h <<_ACEOF @@ -2830,8 +2830,9 @@ DEPDIR="${am__leading_dot}deps" am_make=${MAKE-make} cat > confinc << 'END' -doit: +am__doit: @echo done +.PHONY: am__doit END # If we don't find an include directive, just comment out the code. echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 @@ -2906,18 +2907,32 @@ else # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_CC_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -2935,11 +2950,12 @@ else # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && - grep conftest.h conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # (even with -Werror). So we grep stderr for any message @@ -3313,18 +3329,32 @@ else # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_CXX_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -3342,11 +3372,12 @@ else # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && - grep conftest.h conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # (even with -Werror). So we grep stderr for any message @@ -6319,7 +6350,7 @@ if test "${ac_cv_lib_wx_gtk_2_4_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lwx_gtk-2.4 $LIBS" +LIBS="-lwx_gtk-2.4 -L/usr/lib64 -L/usr/lib `gtk-config --libs` `glib-config --libs glib gmodule gthread` $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -6425,13 +6456,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 -L/usr/lib64 -L/usr/lib $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -6446,11 +6477,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; } @@ -6467,19 +6498,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 @@ -6495,7 +6526,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. */ @@ -7424,7 +7455,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 @@ -8043,9 +8080,11 @@ _ACEOF ctlibs_base="$ctlibs_base -lgetopt" LDFLAGS="$LDFLAGS -L../getopt" + GETOPTLONG=1 +fi -if test 1==1; then +if test "$GETOPTLONG"="1"; then INCLUDED_GETOPT_LONG_TRUE= INCLUDED_GETOPT_LONG_FALSE='#' else @@ -8053,7 +8092,6 @@ else INCLUDED_GETOPT_LONG_FALSE= fi -fi if test "${readline}" = "true" ; then ctlibs_base="$ctlibs_base -lreadline" @@ -9688,7 +9726,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 @@ -9699,7 +9737,7 @@ echo "${ECHO_T}yes" >&6 ctlib_graphics="$ctlib_graphics -lGL -lGLU" if test "$wxwin" = "true" ; then if "$wx_gtk" ; then - ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.4" + ctlib_graphics="$ctlib_graphics `wx-config --libs` -lwx_gtk_gl-2.4 `gtk-config --libs` `glib-config --libs glib gmodule gthread`" elif "$wx_mac" ; then ctlib_graphics="$ctlib_graphics -lwx_mac_gl-2.4" fi @@ -9711,9 +9749,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 @@ -9721,11 +9765,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" @@ -9734,7 +9773,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" @@ -9926,9 +9965,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 @@ -9936,9 +9978,6 @@ else HAVE_WXWINDOWS_FALSE= fi -fi - - LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" ctlibs="$ctlibs_base -lctsim $ctlib_graphics -lctsupport $ctlibs_tools" @@ -10757,10 +10796,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