diff options
-rw-r--r-- | lib/make/aclocal.m4 | 128 | ||||
-rw-r--r-- | lib/make/cctk_Config.h.in | 8 | ||||
-rwxr-xr-x | lib/make/configure | 1059 | ||||
-rw-r--r-- | lib/make/configure.in | 265 | ||||
-rw-r--r-- | lib/make/force-reconfigure | 3 |
5 files changed, 895 insertions, 568 deletions
diff --git a/lib/make/aclocal.m4 b/lib/make/aclocal.m4 index b066f388..61c99306 100644 --- a/lib/make/aclocal.m4 +++ b/lib/make/aclocal.m4 @@ -181,24 +181,6 @@ AC_MSG_RESULT($ac_cv_prog_cxx_cross) cross_compiling=$ac_cv_prog_cxx_cross ]) -dnl see Autoconf manual: Examining Syntax -dnl AC_TRY_COMPILE (includes, function-body, [action-if-found [, action-if-not-found]]) -AC_DEFUN(CCTK_PROG_FORTRAN_REAL16_WORKS, -[AC_MSG_CHECKING([for Fortran REAL*16 ($F77 $F77FLAGS)]) -AC_LANG_SAVE -AC_LANG_FORTRAN77 -rm -fr conftest* -AC_TRY_COMPILER([ - PROGRAM main - REAL*16 a - END - ], ac_cv_real16_works, ac_cv_real16_works_not) -AC_LANG_RESTORE -dnl AC_MSG_ERROR([STEEVIE: $ac_cv_real16_works]) -AC_MSG_RESULT($ac_cv_real16_works) -fortran_does_real16=$ac_cv_real16_works -]) - AC_DEFUN(CCTK_HEADER_REGEX, [AC_MSG_CHECKING([for regex.h]) AC_CACHE_VAL(cctk_cv_header_regex_h, @@ -358,3 +340,113 @@ if test "$cctk_cv_have_cxx_bool" = "yes" ; then AC_DEFINE(HAVE_CCTK_CXX_BOOL) fi ]) + +dnl The autoconf 2.13 function AC_TRY_COMPILE does not work for Fortran. +dnl This version is corrected and should work for both C and Fortran. +dnl CCTK_TRY_COMPILE(INCLUDES, FUNCTION-BODY, +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +AC_DEFUN(CCTK_TRY_COMPILE, +[cat > conftest.$ac_ext <<EOF +ifelse(AC_LANG, [FORTRAN77], +[ program main +[$2] + end +], +[dnl This sometimes fails to find confdefs.h, for some reason. +dnl [#]line __oline__ "[$]0" +[#]line __oline__ "configure" +#include "confdefs.h" +[$1] +int main() { +[$2] +; return 0; } +])EOF +if AC_TRY_EVAL(ac_compile); then + ifelse([$3], , :, [rm -rf conftest* + $3]) +else + echo "configure: failed program was:" >&AC_FD_CC + cat conftest.$ac_ext >&AC_FD_CC +ifelse([$4], , , [ rm -rf conftest* + $4 +])dnl +fi +rm -f conftest*]) + +AC_DEFUN(CCTK_FORTRAN_REAL4, +[AC_CACHE_CHECK([for Fortran REAL*4], cctk_cv_have_fortran_real4, +[cctk_cv_have_fortran_real4=no +AC_LANG_SAVE +AC_LANG_FORTRAN77 +CCTK_TRY_COMPILE(,[ REAL*4 a], cctk_cv_have_fortran_real4=yes, cctk_cv_have_fortran_real4=no) +AC_LANG_RESTORE +]) +if test "$cctk_cv_have_fortran_real4" = "yes" ; then + AC_DEFINE(HAVE_CCTK_FORTRAN_REAL4) +fi +]) + +AC_DEFUN(CCTK_FORTRAN_REAL8, +[AC_CACHE_CHECK([for Fortran REAL*8], cctk_cv_have_fortran_real8, +[cctk_cv_have_fortran_real8=no +AC_LANG_SAVE +AC_LANG_FORTRAN77 +CCTK_TRY_COMPILE(,[ REAL*8 a], cctk_cv_have_fortran_real8=yes, cctk_cv_have_fortran_real8=no) +AC_LANG_RESTORE +]) +if test "$cctk_cv_have_fortran_real8" = "yes" ; then + AC_DEFINE(HAVE_CCTK_FORTRAN_REAL8) +fi +]) + +AC_DEFUN(CCTK_FORTRAN_REAL16, +[AC_CACHE_CHECK([for Fortran REAL*16], cctk_cv_have_fortran_real16, +[cctk_cv_have_fortran_real16=no +AC_LANG_SAVE +AC_LANG_FORTRAN77 +CCTK_TRY_COMPILE(,[ REAL*16 a], cctk_cv_have_fortran_real16=yes, cctk_cv_have_fortran_real16=no) +AC_LANG_RESTORE +]) +if test "$cctk_cv_have_fortran_real16" = "yes" ; then + AC_DEFINE(HAVE_CCTK_FORTRAN_REAL16) +fi +]) + +AC_DEFUN(CCTK_FORTRAN_COMPLEX8, +[AC_CACHE_CHECK([for Fortran COMPLEX*8], cctk_cv_have_fortran_complex8, +[cctk_cv_have_fortran_complex8=no +AC_LANG_SAVE +AC_LANG_FORTRAN77 +CCTK_TRY_COMPILE(,[ COMPLEX*8 a], cctk_cv_have_fortran_complex8=yes, cctk_cv_have_fortran_complex8=no) +AC_LANG_RESTORE +]) +if test "$cctk_cv_have_fortran_complex8" = "yes" ; then + AC_DEFINE(HAVE_CCTK_FORTRAN_COMPLEX8) +fi +]) + +AC_DEFUN(CCTK_FORTRAN_COMPLEX16, +[AC_CACHE_CHECK([for Fortran COMPLEX*16], cctk_cv_have_fortran_complex16, +[cctk_cv_have_fortran_complex16=no +AC_LANG_SAVE +AC_LANG_FORTRAN77 +CCTK_TRY_COMPILE(,[ COMPLEX*16 a], cctk_cv_have_fortran_complex16=yes, cctk_cv_have_fortran_complex16=no) +AC_LANG_RESTORE +]) +if test "$cctk_cv_have_fortran_complex16" = "yes" ; then + AC_DEFINE(HAVE_CCTK_FORTRAN_COMPLEX16) +fi +]) + +AC_DEFUN(CCTK_FORTRAN_COMPLEX32, +[AC_CACHE_CHECK([for Fortran COMPLEX*32], cctk_cv_have_fortran_complex32, +[cctk_cv_have_fortran_complex32=no +AC_LANG_SAVE +AC_LANG_FORTRAN77 +CCTK_TRY_COMPILE(,[ COMPLEX*32 a], cctk_cv_have_fortran_complex32=yes, cctk_cv_have_fortran_complex32=no) +AC_LANG_RESTORE +]) +if test "$cctk_cv_have_fortran_complex32" = "yes" ; then + AC_DEFINE(HAVE_CCTK_FORTRAN_COMPLEX32) +fi +]) diff --git a/lib/make/cctk_Config.h.in b/lib/make/cctk_Config.h.in index 2012fcca..d44a13da 100644 --- a/lib/make/cctk_Config.h.in +++ b/lib/make/cctk_Config.h.in @@ -216,6 +216,14 @@ typedef enum {false, true} bool; #ifdef FCODE +#undef HAVE_CCTK_FORTRAN_REAL4 +#undef HAVE_CCTK_FORTRAN_REAL8 +#undef HAVE_CCTK_FORTRAN_REAL16 + +#undef HAVE_CCTK_FORTRAN_COMPLEX8 +#undef HAVE_CCTK_FORTRAN_COMPLEX16 +#undef HAVE_CCTK_FORTRAN_COMPLEX32 + #endif /* FCODE */ /* Now include the code to pick an appropriate precison for reals and ints */ diff --git a/lib/make/configure b/lib/make/configure index 0e81b02e..4188c642 100755 --- a/lib/make/configure +++ b/lib/make/configure @@ -23,8 +23,6 @@ - - # CCTK_CHECK_FUNCS(FUNCTION..., [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------- @@ -49,6 +47,20 @@ + + + + + + + + + + + + + + # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -574,6 +586,7 @@ fi + ####################################################################### # determine WARN_MODE from the WARN option # if this option isn't set WARN_MODE will default to 'no' @@ -591,6 +604,50 @@ fi ####################################################################### +# determine DEBUG_MODE from the DEBUG option +# if this option isn't set DEBUG_MODE will default to 'no' +if test -n "$DEBUG" ; then + + DEBUG=`echo $DEBUG | tr '[:upper:]' '[:lower:]'` + +fi + +if test -n "$DEBUG" -a "$DEBUG" != 'no' ; then + cat >> confdefs.h <<\EOF +#define CCTK_DEBUG 1 +EOF + + case "$DEBUG" in + memory) + cat >> confdefs.h <<\EOF +#define CCTK_TRACEMEMORY 1 +EOF + + ;; + flags|yes) + DEBUG_FLAGS='yes' + ;; + defines) + cat >> confdefs.h <<\EOF +#define DEBUG 1 +EOF + + ;; + all) + cat >> confdefs.h <<\EOF +#define CCTK_TRACEMEMORY 1 +EOF + + DEBUG_FLAGS='yes' + ;; + *) + { echo "configure: error: Didn't recognize setting of DEBUG=\"$DEBUG\"" 1>&2; exit 1; } + ;; + esac +fi + + +####################################################################### # determine OPTIMISE_MODE from the OPTIMISE/OPTIMIZE option # if this option isn't set OPTIMISE_MODE will default to 'yes' @@ -660,7 +717,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:664: checking host system type" >&5 +echo "configure:721: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -706,7 +763,7 @@ if test -n "$LIBS" ; then fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:710: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:767: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -739,7 +796,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:743: checking for $ac_word" >&5 +echo "configure:800: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -771,7 +828,7 @@ done fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:775: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:832: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -783,12 +840,12 @@ cross_compiling=$ac_cv_prog_cc_cross rm -fr conftest* cat > conftest.$ac_ext << EOF -#line 787 "configure" +#line 844 "configure" #include "confdefs.h" main(){return(0);} int PilotMain(){return(0);} EOF -if { (eval echo configure:792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -814,12 +871,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:818: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:875: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:823: checking whether we are using GNU C" >&5 +echo "configure:880: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -828,7 +885,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -844,7 +901,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:848: checking for $ac_word" >&5 +echo "configure:905: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -876,7 +933,7 @@ done fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:880: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:937: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -888,12 +945,12 @@ cross_compiling=$ac_cv_prog_cxx_cross rm -fr conftest* cat > conftest.$ac_ext << EOF -#line 892 "configure" +#line 949 "configure" #include "confdefs.h" int main(){return(0);} extern "C" int PilotMain(){return(0);} EOF -if { (eval echo configure:897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -919,12 +976,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:923: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:980: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:928: checking whether we are using GNU C++" >&5 +echo "configure:985: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -933,7 +990,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -947,7 +1004,7 @@ if test -z "$RANLIB" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:951: checking for $ac_word" >&5 +echo "configure:1008: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -983,7 +1040,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:987: checking for $ac_word" >&5 +echo "configure:1044: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1029,7 +1086,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1033: checking for $ac_word" >&5 +echo "configure:1090: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_FPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1073,7 +1130,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1077: checking for $ac_word" >&5 +echo "configure:1134: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1110,7 +1167,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1114: checking for $ac_word" >&5 +echo "configure:1171: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_F90'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1147,7 +1204,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1151: checking for $ac_word" >&5 +echo "configure:1208: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1184,7 +1241,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1188: checking for $ac_word" >&5 +echo "configure:1245: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1221,7 +1278,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1225: checking for $ac_word" >&5 +echo "configure:1282: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MKDIR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1258,7 +1315,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1262: checking for $ac_word" >&5 +echo "configure:1319: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1345,14 +1402,105 @@ fi # Finish the architecture stuff CCTK_WriteLine cctk_Archdefs.h '#endif /* _CCTK_ARCHDEFS_H_ */' + + +# Set the warn flags + + +# Set the warning flags if they've not been set by now +# (using GNU compiler warning flags as a reasonable default) + +if test -z "$C_WARN_FLAGS" -a "$CC" = 'gcc' ; then + C_WARN_FLAGS='-Wall -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Winline' +else + : ${C_WARN_FLAGS=''} +fi + + +if test -z "$CXX_WARN_FLAGS" -a \( "$CXX" = 'c++' -o "$CXX" = 'g++' \) ; then + CXX_WARN_FLAGS='-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Winline -Woverloaded-virtual' +else + : ${CXX_WARN_FLAGS=''} +fi + + +if test -z "$F77_WARN_FLAGS" -a "$F77" = 'g77' ; then + F77_WARN_FLAGS='-Wall' +else + : ${F77_WARN_FLAGS=''} +fi + + +: ${F90_WARN_FLAGS=''} + + + +DEBUG_MODE='no' +if test -n "$DEBUG_FLAGS"; then + DEBUG_MODE=$DEBUG_FLAGS +fi + +# Set the debug flags if they've not been set by now +# (using '-g' as a reasonable default) + +: ${C_DEBUG_FLAGS='-g'} + + +: ${CXX_DEBUG_FLAGS='-g'} + + +: ${F77_DEBUG_FLAGS='-g'} + + +: ${F90_DEBUG_FLAGS='-g'} + + +# Set the optimization flags if they've not been set by now +# (using '-O2' as a reasonable default) + + + +: ${C_OPTIMISE_FLAGS='-O2'} + + +: ${CXX_OPTIMISE_FLAGS='-O2'} + + +if test -z "$F77_OPTIMISE_FLAGS" -a "$F77" = 'g77' ; then + F77_OPTIMISE_FLAGS='-O2' +else + : ${F77_OPTIMISE_FLAGS=''} +fi + + +: ${F90_OPTIMISE_FLAGS=''} + + +# Set the profiling flags if they've not been set by now +# (using '-pg' as a reasonable default) + + + +: ${C_PROFILE_FLAGS='-pg'} + + +: ${CXX_PROFILE_FLAGS='-pg'} + + +: ${F77_PROFILE_FLAGS='-pg'} + + +: ${F90_PROFILE_FLAGS='-pg'} + ########################################################################## -######################################################################### # The known architecture stuff has probably set the LIBS variable # So remember what it is and set it to blank to prevent any problems with the # rest of the configure stuff. +######################################################################### + KNOWN_LIBS="$LIBS" unset LIBS @@ -1368,7 +1516,7 @@ unset LDFLAGS echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1372: checking how to run the C preprocessor" >&5 +echo "configure:1520: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1383,13 +1531,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1387 "configure" +#line 1535 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1400,13 +1548,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1404 "configure" +#line 1552 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1417,13 +1565,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1421 "configure" +#line 1569 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1448,12 +1596,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1452: checking for ANSI C header files" >&5 +echo "configure:1600: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1457 "configure" +#line 1605 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1461,7 +1609,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1478,7 +1626,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1482 "configure" +#line 1630 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1496,7 +1644,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1500 "configure" +#line 1648 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1517,7 +1665,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1521 "configure" +#line 1669 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1528,7 +1676,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1555,14 +1703,14 @@ fi if test "x$cross_compiling" = 'xno' ; then echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1559: checking whether byte ordering is bigendian" >&5 +echo "configure:1707: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 1566 "configure" +#line 1714 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1573,11 +1721,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 1581 "configure" +#line 1729 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1588,7 +1736,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1608,7 +1756,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1612 "configure" +#line 1760 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -1621,7 +1769,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1664,7 +1812,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_LONG_LONG" ; then fi echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:1668: checking size of long long" >&5 +echo "configure:1816: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1672,7 +1820,7 @@ else ac_cv_sizeof_long_long=$SIZEOF_LONG_LONG else cat > conftest.$ac_ext <<EOF -#line 1676 "configure" +#line 1824 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1683,7 +1831,7 @@ main() exit(0); } EOF -if { (eval echo configure:1687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -1708,7 +1856,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_LONG_INT" ; then fi echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:1712: checking size of long int" >&5 +echo "configure:1860: checking size of long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1716,7 +1864,7 @@ else ac_cv_sizeof_long_int=$SIZEOF_LONG_INT else cat > conftest.$ac_ext <<EOF -#line 1720 "configure" +#line 1868 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1727,7 +1875,7 @@ main() exit(0); } EOF -if { (eval echo configure:1731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_int=`cat conftestval` else @@ -1752,7 +1900,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_INT" ; then fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1756: checking size of int" >&5 +echo "configure:1904: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1760,7 +1908,7 @@ else ac_cv_sizeof_int=$SIZEOF_INT else cat > conftest.$ac_ext <<EOF -#line 1764 "configure" +#line 1912 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1771,7 +1919,7 @@ main() exit(0); } EOF -if { (eval echo configure:1775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -1796,7 +1944,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_SHORT_INT" ; then fi echo $ac_n "checking size of short int""... $ac_c" 1>&6 -echo "configure:1800: checking size of short int" >&5 +echo "configure:1948: checking size of short int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1804,7 +1952,7 @@ else ac_cv_sizeof_short_int=$SIZEOF_SHORT_INT else cat > conftest.$ac_ext <<EOF -#line 1808 "configure" +#line 1956 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1815,7 +1963,7 @@ main() exit(0); } EOF -if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short_int=`cat conftestval` else @@ -1842,7 +1990,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_LONG_DOUBLE" ; then fi echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:1846: checking size of long double" >&5 +echo "configure:1994: checking size of long double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1850,7 +1998,7 @@ else ac_cv_sizeof_long_double=$SIZEOF_LONG_DOUBLE else cat > conftest.$ac_ext <<EOF -#line 1854 "configure" +#line 2002 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1861,7 +2009,7 @@ main() exit(0); } EOF -if { (eval echo configure:1865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_double=`cat conftestval` else @@ -1886,7 +2034,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_DOUBLE" ; then fi echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:1890: checking size of double" >&5 +echo "configure:2038: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1894,7 +2042,7 @@ else ac_cv_sizeof_double=$SIZEOF_DOUBLE else cat > conftest.$ac_ext <<EOF -#line 1898 "configure" +#line 2046 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1905,7 +2053,7 @@ main() exit(0); } EOF -if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -1931,7 +2079,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_FLOAT" ; then fi echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:1935: checking size of float" >&5 +echo "configure:2083: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1939,7 +2087,7 @@ else ac_cv_sizeof_float=$SIZEOF_FLOAT else cat > conftest.$ac_ext <<EOF -#line 1943 "configure" +#line 2091 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1950,7 +2098,7 @@ main() exit(0); } EOF -if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -1977,7 +2125,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_POINTER" ; then fi echo $ac_n "checking size of char *""... $ac_c" 1>&6 -echo "configure:1981: checking size of char *" >&5 +echo "configure:2129: checking size of char *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1985,7 +2133,7 @@ else ac_cv_sizeof_char_p=$SIZEOF_POINTER else cat > conftest.$ac_ext <<EOF -#line 1989 "configure" +#line 2137 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1996,7 +2144,7 @@ main() exit(0); } EOF -if { (eval echo configure:2000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char_p=`cat conftestval` else @@ -2031,7 +2179,7 @@ EOF else echo $ac_n "checking for the null device""... $ac_c" 1>&6 -echo "configure:2035: checking for the null device" >&5 +echo "configure:2183: checking for the null device" >&5 if eval "test \"`echo '$''{'cctk_cv_nulldevice'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2094,12 +2242,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2098: checking for $ac_func" >&5 +echo "configure:2246: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2103 "configure" +#line 2251 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2122,7 +2270,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2144,7 +2292,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in library nsl""... $ac_c" 1>&6 -echo "configure:2148: checking for gethostbyname in library nsl" >&5 +echo "configure:2296: checking for gethostbyname in library nsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2153,7 +2301,7 @@ else ac_save_LIBS="$LIBS" LIBS="nsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2157 "configure" +#line 2305 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2164,7 +2312,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2195,12 +2343,12 @@ done # Check if we have mode_t available echo $ac_n "checking if mode_t is defined""... $ac_c" 1>&6 -echo "configure:2199: checking if mode_t is defined" >&5 +echo "configure:2347: checking if mode_t is defined" >&5 if eval "test \"`echo '$''{'cctk_cv_have_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2204 "configure" +#line 2352 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -2210,7 +2358,7 @@ int main() { mode_t foo; return 0 ; return 0; } EOF -if { (eval echo configure:2214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have_mode_t=yes" else @@ -2236,12 +2384,12 @@ fi echo $ac_n "checking for availability of gettimeofday timing""... $ac_c" 1>&6 -echo "configure:2240: checking for availability of gettimeofday timing" >&5 +echo "configure:2388: checking for availability of gettimeofday timing" >&5 if eval "test \"`echo '$''{'cctk_cv_time_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2245 "configure" +#line 2393 "configure" #include "confdefs.h" int main() { @@ -2249,7 +2397,7 @@ gettimeofday(0, 0); return 0; ; return 0; } EOF -if { (eval echo configure:2253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "cctk_cv_time_gettimeofday=yes" else @@ -2271,12 +2419,12 @@ else fi if eval "test \"`echo '$cctk_cv_time_gettimeofday'`\" = yes"; then echo $ac_n "checking if gettimeofday needs timezone""... $ac_c" 1>&6 -echo "configure:2275: checking if gettimeofday needs timezone" >&5 +echo "configure:2423: checking if gettimeofday needs timezone" >&5 if eval "test \"`echo '$''{'cctk_cv_time_gettimeofday_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2280 "configure" +#line 2428 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/time.h> @@ -2289,7 +2437,7 @@ struct timeval tp; return 0; ; return 0; } EOF -if { (eval echo configure:2293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "cctk_cv_time_gettimeofday_timezone=yes" else @@ -2312,12 +2460,12 @@ fi fi echo $ac_n "checking for availability of getrusage timing""... $ac_c" 1>&6 -echo "configure:2316: checking for availability of getrusage timing" >&5 +echo "configure:2464: checking for availability of getrusage timing" >&5 if eval "test \"`echo '$''{'cctk_cv_time_getrusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2321 "configure" +#line 2469 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/time.h> @@ -2330,7 +2478,7 @@ struct rusage ru; return 0; ; return 0; } EOF -if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "cctk_cv_time_getrusage=yes" else @@ -2352,12 +2500,12 @@ else fi echo $ac_n "checking for availability of _ftime timing""... $ac_c" 1>&6 -echo "configure:2356: checking for availability of _ftime timing" >&5 +echo "configure:2504: checking for availability of _ftime timing" >&5 if eval "test \"`echo '$''{'cctk_cv_time_ftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2361 "configure" +#line 2509 "configure" #include "confdefs.h" #include <stdio.h> #include <time.h> @@ -2370,7 +2518,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "cctk_cv_time_ftime=yes" else @@ -2397,12 +2545,12 @@ for cctk_hdr in time.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2401: checking for $cctk_hdr" >&5 +echo "configure:2549: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2406 "configure" +#line 2554 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2410,7 +2558,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2437,12 +2585,12 @@ for cctk_hdr in sys/time.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2441: checking for $cctk_hdr" >&5 +echo "configure:2589: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2446 "configure" +#line 2594 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2450,7 +2598,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2477,12 +2625,12 @@ for cctk_hdr in sys/types.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2481: checking for $cctk_hdr" >&5 +echo "configure:2629: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2486 "configure" +#line 2634 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2490,7 +2638,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2517,12 +2665,12 @@ for cctk_hdr in unistd.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2521: checking for $cctk_hdr" >&5 +echo "configure:2669: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2526 "configure" +#line 2674 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2530,7 +2678,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2557,12 +2705,12 @@ for cctk_hdr in string.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2561: checking for $cctk_hdr" >&5 +echo "configure:2709: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2566 "configure" +#line 2714 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2570,7 +2718,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2597,12 +2745,12 @@ for cctk_hdr in assert.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2601: checking for $cctk_hdr" >&5 +echo "configure:2749: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2606 "configure" +#line 2754 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2610,7 +2758,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2637,12 +2785,12 @@ for cctk_hdr in sys/stat.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2641: checking for $cctk_hdr" >&5 +echo "configure:2789: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2646 "configure" +#line 2794 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2650,7 +2798,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2677,12 +2825,12 @@ for cctk_hdr in getopt.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2681: checking for $cctk_hdr" >&5 +echo "configure:2829: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2686 "configure" +#line 2834 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2690,7 +2838,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2717,12 +2865,12 @@ for cctk_hdr in dirent.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2721: checking for $cctk_hdr" >&5 +echo "configure:2869: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2726 "configure" +#line 2874 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2730,7 +2878,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2754,12 +2902,12 @@ fi done echo $ac_n "checking for regex.h""... $ac_c" 1>&6 -echo "configure:2758: checking for regex.h" >&5 +echo "configure:2906: checking for regex.h" >&5 if eval "test \"`echo '$''{'cctk_cv_header_regex_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2763 "configure" +#line 2911 "configure" #include "confdefs.h" #include <stdio.h> #include <regex.h> @@ -2767,7 +2915,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:2771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_regex_h=yes" else @@ -2792,12 +2940,12 @@ for cctk_hdr in sys/filio.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2796: checking for $cctk_hdr" >&5 +echo "configure:2944: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2801 "configure" +#line 2949 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -2807,7 +2955,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2834,12 +2982,12 @@ for cctk_hdr in sys/ioctl.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2838: checking for $cctk_hdr" >&5 +echo "configure:2986: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2991 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -2849,7 +2997,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2876,12 +3024,12 @@ for cctk_hdr in sys/socket.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2880: checking for $cctk_hdr" >&5 +echo "configure:3028: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2885 "configure" +#line 3033 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -2891,7 +3039,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2918,12 +3066,12 @@ for cctk_hdr in netinet/in.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2922: checking for $cctk_hdr" >&5 +echo "configure:3070: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2927 "configure" +#line 3075 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -2933,7 +3081,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2960,12 +3108,12 @@ for cctk_hdr in netdb.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2964: checking for $cctk_hdr" >&5 +echo "configure:3112: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2969 "configure" +#line 3117 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -2975,7 +3123,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3002,12 +3150,12 @@ for cctk_hdr in arpa/inet.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:3006: checking for $cctk_hdr" >&5 +echo "configure:3154: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3011 "configure" +#line 3159 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -3017,7 +3165,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3044,12 +3192,12 @@ for cctk_hdr in winsock2.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:3048: checking for $cctk_hdr" >&5 +echo "configure:3196: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3053 "configure" +#line 3201 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -3057,7 +3205,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3084,12 +3232,12 @@ for cctk_hdr in crypt.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:3088: checking for $cctk_hdr" >&5 +echo "configure:3236: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3093 "configure" +#line 3241 "configure" #include "confdefs.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -3099,7 +3247,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3126,12 +3274,12 @@ for cctk_hdr in signal.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:3130: checking for $cctk_hdr" >&5 +echo "configure:3278: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3135 "configure" +#line 3283 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -3139,7 +3287,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3164,12 +3312,12 @@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3168: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3316: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3173 "configure" +#line 3321 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -3178,7 +3326,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3203,12 +3351,12 @@ fi # Check if we have socklen_t available echo $ac_n "checking if socklen_t is defined""... $ac_c" 1>&6 -echo "configure:3207: checking if socklen_t is defined" >&5 +echo "configure:3355: checking if socklen_t is defined" >&5 if eval "test \"`echo '$''{'cctk_cv_have_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3212 "configure" +#line 3360 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -3228,7 +3376,7 @@ int main() { socklen_t foo; return 0 ; return 0; } EOF -if { (eval echo configure:3232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have_socklen_t=yes" else @@ -3253,12 +3401,12 @@ fi # Check if someone has defined SOCKET echo $ac_n "checking if SOCKET is defined""... $ac_c" 1>&6 -echo "configure:3257: checking if SOCKET is defined" >&5 +echo "configure:3405: checking if SOCKET is defined" >&5 if eval "test \"`echo '$''{'cctk_cv_have_SOCKET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3262 "configure" +#line 3410 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -3278,7 +3426,7 @@ int main() { SOCKET foo; return 0 ; return 0; } EOF -if { (eval echo configure:3282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have_SOCKET=yes" else @@ -3303,19 +3451,19 @@ fi # Check if we have __int64 echo $ac_n "checking if __int64 is defined""... $ac_c" 1>&6 -echo "configure:3307: checking if __int64 is defined" >&5 +echo "configure:3455: checking if __int64 is defined" >&5 if eval "test \"`echo '$''{'cctk_cv_have___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3312 "configure" +#line 3460 "configure" #include "confdefs.h" int main() { __int64 foo; return 0 ; return 0; } EOF -if { (eval echo configure:3319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have___int64=yes" else @@ -3350,12 +3498,12 @@ cross_compiling=$ac_cv_prog_cxx_cross do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:3354: checking for $cctk_hdr" >&5 +echo "configure:3502: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3359 "configure" +#line 3507 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -3363,7 +3511,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3402,12 +3550,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in getopt_long_only do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3406: checking for $ac_func" >&5 +echo "configure:3554: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3411 "configure" +#line 3559 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3430,7 +3578,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3473,12 +3621,12 @@ else fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3477: checking for working const" >&5 +echo "configure:3625: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3482 "configure" +#line 3630 "configure" #include "confdefs.h" int main() { @@ -3527,7 +3675,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:3531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3548,21 +3696,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3552: checking for inline" >&5 +echo "configure:3700: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 3559 "configure" +#line 3707 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:3566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3589,14 +3737,14 @@ esac echo $ac_n "checking for C restrict""... $ac_c" 1>&6 -echo "configure:3593: checking for C restrict" >&5 +echo "configure:3741: checking for C restrict" >&5 if eval "test \"`echo '$''{'cctk_cv_c_restrict'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cctk_cv_c_restrict=no for ac_kw in restrict __restrict__ __restrict; do cat > conftest.$ac_ext <<EOF -#line 3600 "configure" +#line 3748 "configure" #include "confdefs.h" int main() { @@ -3607,7 +3755,7 @@ struct tux { char * $ac_kw arr[3]; }; ; return 0; } EOF -if { (eval echo configure:3611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_c_restrict=$ac_kw; break else @@ -3633,7 +3781,7 @@ EOF esac echo $ac_n "checking for C++ restrict""... $ac_c" 1>&6 -echo "configure:3637: checking for C++ restrict" >&5 +echo "configure:3785: checking for C++ restrict" >&5 if eval "test \"`echo '$''{'cctk_cv_cxx_restrict'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3648,7 +3796,7 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_kw in restrict __restrict__ __restrict; do cat > conftest.$ac_ext <<EOF -#line 3652 "configure" +#line 3800 "configure" #include "confdefs.h" int main() { @@ -3659,7 +3807,7 @@ struct tux { char * $ac_kw arr[3]; }; ; return 0; } EOF -if { (eval echo configure:3663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_cxx_restrict=$ac_kw; break else @@ -3693,20 +3841,20 @@ esac echo $ac_n "checking for C bool""... $ac_c" 1>&6 -echo "configure:3697: checking for C bool" >&5 +echo "configure:3845: checking for C bool" >&5 if eval "test \"`echo '$''{'cctk_cv_have_c_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cctk_cv_have_c_bool=no cat > conftest.$ac_ext <<EOF -#line 3703 "configure" +#line 3851 "configure" #include "confdefs.h" int main() { bool foo; ; return 0; } EOF -if { (eval echo configure:3710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_c_bool=yes else @@ -3728,7 +3876,7 @@ EOF fi echo $ac_n "checking for CXX bool""... $ac_c" 1>&6 -echo "configure:3732: checking for CXX bool" >&5 +echo "configure:3880: checking for CXX bool" >&5 if eval "test \"`echo '$''{'cctk_cv_have_cxx_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3742,14 +3890,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 3746 "configure" +#line 3894 "configure" #include "confdefs.h" int main() { bool foo; ; return 0; } EOF -if { (eval echo configure:3753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_cxx_bool=yes else @@ -3778,37 +3926,78 @@ EOF fi -echo $ac_n "checking for Fortran REAL*16 ($F77 $F77FLAGS)""... $ac_c" 1>&6 -echo "configure:3783: checking for Fortran REAL*16 ($F77 $F77FLAGS)" >&5 +echo $ac_n "checking for Fortran REAL*4""... $ac_c" 1>&6 +echo "configure:3931: checking for Fortran REAL*4" >&5 +if eval "test \"`echo '$''{'cctk_cv_have_fortran_real4'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cctk_cv_have_fortran_real4=no ac_ext=f ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5' ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_f77_cross -rm -fr conftest* -cat > conftest.$ac_ext << EOF +cat > conftest.$ac_ext <<EOF + program main + REAL*4 a + end +EOF +if { (eval echo configure:3947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cctk_cv_have_fortran_real4=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cctk_cv_have_fortran_real4=no +fi +rm -f conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +fi - PROGRAM main - REAL*16 a - END - +echo "$ac_t""$cctk_cv_have_fortran_real4" 1>&6 +if test "$cctk_cv_have_fortran_real4" = "yes" ; then + cat >> confdefs.h <<\EOF +#define HAVE_CCTK_FORTRAN_REAL4 1 EOF -if { (eval echo configure:3799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_real16_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_real16_works_not=no - else - ac_cv_real16_works_not=yes - fi + +fi + +echo $ac_n "checking for Fortran REAL*8""... $ac_c" 1>&6 +echo "configure:3976: checking for Fortran REAL*8" >&5 +if eval "test \"`echo '$''{'cctk_cv_have_fortran_real8'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cctk_cv_have_fortran_real8=no + +ac_ext=f +ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5' +ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_f77_cross + +cat > conftest.$ac_ext <<EOF + program main + REAL*8 a + end +EOF +if { (eval echo configure:3992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cctk_cv_have_fortran_real8=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_real16_works=no + rm -rf conftest* + cctk_cv_have_fortran_real8=no fi -rm -fr conftest* +rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' @@ -3816,42 +4005,207 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -echo "$ac_t""$ac_cv_real16_works" 1>&6 -fortran_does_real16=$ac_cv_real16_works -echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:3824: checking whether we are using GNU C++" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then +fi + +echo "$ac_t""$cctk_cv_have_fortran_real8" 1>&6 +if test "$cctk_cv_have_fortran_real8" = "yes" ; then + cat >> confdefs.h <<\EOF +#define HAVE_CCTK_FORTRAN_REAL8 1 +EOF + +fi + +echo $ac_n "checking for Fortran REAL*16""... $ac_c" 1>&6 +echo "configure:4021: checking for Fortran REAL*16" >&5 +if eval "test \"`echo '$''{'cctk_cv_have_fortran_real16'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.C <<EOF -#ifdef __GNUC__ - yes; -#endif + cctk_cv_have_fortran_real16=no + +ac_ext=f +ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5' +ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_f77_cross + +cat > conftest.$ac_ext <<EOF + program main + REAL*16 a + end EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:3833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes +if { (eval echo configure:4037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cctk_cv_have_fortran_real16=yes else - ac_cv_prog_gxx=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cctk_cv_have_fortran_real16=no fi +rm -f conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + fi -echo "$ac_t""$ac_cv_prog_gxx" 1>&6 -if test "$fortran_does_real16" = 'yes'; then - cat >> confdefs.h <<\EOF -#define HAVE_FORTRAN_REAL16 1 +echo "$ac_t""$cctk_cv_have_fortran_real16" 1>&6 +if test "$cctk_cv_have_fortran_real16" = "yes" ; then + cat >> confdefs.h <<\EOF +#define HAVE_CCTK_FORTRAN_REAL16 1 EOF fi + +echo $ac_n "checking for Fortran COMPLEX*8""... $ac_c" 1>&6 +echo "configure:4067: checking for Fortran COMPLEX*8" >&5 +if eval "test \"`echo '$''{'cctk_cv_have_fortran_complex8'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cctk_cv_have_fortran_complex8=no + +ac_ext=f +ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5' +ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_f77_cross + +cat > conftest.$ac_ext <<EOF + program main + COMPLEX*8 a + end +EOF +if { (eval echo configure:4083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cctk_cv_have_fortran_complex8=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cctk_cv_have_fortran_complex8=no +fi +rm -f conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + +fi + +echo "$ac_t""$cctk_cv_have_fortran_complex8" 1>&6 +if test "$cctk_cv_have_fortran_complex8" = "yes" ; then + cat >> confdefs.h <<\EOF +#define HAVE_CCTK_FORTRAN_COMPLEX8 1 +EOF + +fi + +echo $ac_n "checking for Fortran COMPLEX*16""... $ac_c" 1>&6 +echo "configure:4112: checking for Fortran COMPLEX*16" >&5 +if eval "test \"`echo '$''{'cctk_cv_have_fortran_complex16'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cctk_cv_have_fortran_complex16=no + +ac_ext=f +ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5' +ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_f77_cross + +cat > conftest.$ac_ext <<EOF + program main + COMPLEX*16 a + end +EOF +if { (eval echo configure:4128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cctk_cv_have_fortran_complex16=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cctk_cv_have_fortran_complex16=no +fi +rm -f conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + +fi + +echo "$ac_t""$cctk_cv_have_fortran_complex16" 1>&6 +if test "$cctk_cv_have_fortran_complex16" = "yes" ; then + cat >> confdefs.h <<\EOF +#define HAVE_CCTK_FORTRAN_COMPLEX16 1 +EOF + +fi + +echo $ac_n "checking for Fortran COMPLEX*32""... $ac_c" 1>&6 +echo "configure:4157: checking for Fortran COMPLEX*32" >&5 +if eval "test \"`echo '$''{'cctk_cv_have_fortran_complex32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cctk_cv_have_fortran_complex32=no + +ac_ext=f +ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5' +ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_f77_cross + +cat > conftest.$ac_ext <<EOF + program main + COMPLEX*32 a + end +EOF +if { (eval echo configure:4173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cctk_cv_have_fortran_complex32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cctk_cv_have_fortran_complex32=no +fi +rm -f conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + +fi + +echo "$ac_t""$cctk_cv_have_fortran_complex32" 1>&6 +if test "$cctk_cv_have_fortran_complex32" = "yes" ; then + cat >> confdefs.h <<\EOF +#define HAVE_CCTK_FORTRAN_COMPLEX32 1 +EOF + +fi + + ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext `CCTK_Wrap "$LIBDIR_PREFIX" "$LIBDIR_SUFFIX" "$LIBDIRS"` `CCTK_Wrap "$LIBLINK_PREFIX" "$LIBLINK_SUFFIX" "$LIBS"` >&5' echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:3850: checking for crypt" >&5 +echo "configure:4204: checking for crypt" >&5 if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3855 "configure" +#line 4209 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char crypt(); below. */ @@ -3874,7 +4228,7 @@ crypt(); ; return 0; } EOF -if { (eval echo configure:3878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -3892,7 +4246,7 @@ if eval "test \"`echo '$ac_cv_func_'crypt`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in library crypt""... $ac_c" 1>&6 -echo "configure:3896: checking for crypt in library crypt" >&5 +echo "configure:4250: checking for crypt in library crypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3901,7 +4255,7 @@ else ac_save_LIBS="$LIBS" LIBS="crypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 3905 "configure" +#line 4259 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3912,7 +4266,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:3916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3953,12 +4307,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in finite do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3957: checking for $ac_func" >&5 +echo "configure:4311: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3962 "configure" +#line 4316 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3981,7 +4335,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4003,7 +4357,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for finite in library m""... $ac_c" 1>&6 -echo "configure:4007: checking for finite in library m" >&5 +echo "configure:4361: checking for finite in library m" >&5 ac_lib_var=`echo m'_'finite | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4012,7 +4366,7 @@ else ac_save_LIBS="$LIBS" LIBS="m $LIBS" cat > conftest.$ac_ext <<EOF -#line 4016 "configure" +#line 4370 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4023,7 +4377,7 @@ int main() { finite() ; return 0; } EOF -if { (eval echo configure:4027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4065,12 +4419,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in isnan do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4069: checking for $ac_func" >&5 +echo "configure:4423: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4074 "configure" +#line 4428 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4093,7 +4447,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4115,7 +4469,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for isnan in library m""... $ac_c" 1>&6 -echo "configure:4119: checking for isnan in library m" >&5 +echo "configure:4473: checking for isnan in library m" >&5 ac_lib_var=`echo m'_'isnan | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4124,7 +4478,7 @@ else ac_save_LIBS="$LIBS" LIBS="m $LIBS" cat > conftest.$ac_ext <<EOF -#line 4128 "configure" +#line 4482 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4135,7 +4489,7 @@ int main() { isnan() ; return 0; } EOF -if { (eval echo configure:4139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4177,12 +4531,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4181: checking for $ac_func" >&5 +echo "configure:4535: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4186 "configure" +#line 4540 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4205,7 +4559,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4227,7 +4581,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for mkstemp in library c""... $ac_c" 1>&6 -echo "configure:4231: checking for mkstemp in library c" >&5 +echo "configure:4585: checking for mkstemp in library c" >&5 ac_lib_var=`echo c'_'mkstemp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4236,7 +4590,7 @@ else ac_save_LIBS="$LIBS" LIBS="c $LIBS" cat > conftest.$ac_ext <<EOF -#line 4240 "configure" +#line 4594 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4247,7 +4601,7 @@ int main() { mkstemp() ; return 0; } EOF -if { (eval echo configure:4251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4286,19 +4640,19 @@ done echo $ac_n "checking for va_copy""... $ac_c" 1>&6 -echo "configure:4290: checking for va_copy" >&5 +echo "configure:4644: checking for va_copy" >&5 if eval "test \"`echo '$''{'cctk_cv_have_va_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4295 "configure" +#line 4649 "configure" #include "confdefs.h" #include <stdarg.h> int main() { va_list src, dest; va_copy(dest, src); return 0 ; return 0; } EOF -if { (eval echo configure:4302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "cctk_cv_have_va_copy=yes" else @@ -4325,7 +4679,7 @@ fi if test "X$PTHREADS" = 'Xyes'; then PTHREAD_LIBS= echo $ac_n "checking for main in library c_r""... $ac_c" 1>&6 -echo "configure:4329: checking for main in library c_r" >&5 +echo "configure:4683: checking for main in library c_r" >&5 ac_lib_var=`echo c_r'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4334,14 +4688,14 @@ else ac_save_LIBS="$LIBS" LIBS="c_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 4338 "configure" +#line 4692 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4362,7 +4716,7 @@ else fi echo $ac_n "checking for main in library pthread""... $ac_c" 1>&6 -echo "configure:4366: checking for main in library pthread" >&5 +echo "configure:4720: checking for main in library pthread" >&5 ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4371,14 +4725,14 @@ else ac_save_LIBS="$LIBS" LIBS="pthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 4375 "configure" +#line 4729 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4397,7 +4751,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in library pthreads""... $ac_c" 1>&6 -echo "configure:4401: checking for main in library pthreads" >&5 +echo "configure:4755: checking for main in library pthreads" >&5 ac_lib_var=`echo pthreads'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4406,14 +4760,14 @@ else ac_save_LIBS="$LIBS" LIBS="pthreads $LIBS" cat > conftest.$ac_ext <<EOF -#line 4410 "configure" +#line 4764 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4538,10 +4892,6 @@ EOF fi # Float types -echo "Float types" -echo "x$ac_cv_sizeof_long_double" -echo "x$ac_cv_sizeof_double" -echo "x$ac_cv_sizeof_float" case "x$ac_cv_sizeof_long_double" in 'x16') CCTK_REAL16='long double' ;; @@ -4573,7 +4923,7 @@ if test "x$DISABLE_REAL16" != 'xyes' -a "x$DISABLE_REAL16" != 'xno' -a "x$DISABL { echo "configure: error: Didn't recognise setting of DISABLE_REAL16=\"$DISABLE_REAL16\"; should be either \"yes\" or \"no\" or \"\" (empty)" 1>&2; exit 1; } fi -if test -n "$CCTK_REAL16" -a "x$DISABLE_REAL16" != 'xyes' -a -n "$HAVE_FORTRAN_REAL16" ; then +if test -n "$CCTK_REAL16" -a "x$cctk_cv_have_fortran_real16" = 'xyes' -a "x$cctk_cv_have_fortran_complex32" = 'xyes' -a "x$DISABLE_REAL16" != 'xyes' ; then cat >> confdefs.h <<EOF #define CCTK_REAL16 $CCTK_REAL16 EOF @@ -4584,7 +4934,7 @@ EOF fi -if test -n "$CCTK_REAL8" ; then +if test -n "$CCTK_REAL8" -a "x$cctk_cv_have_fortran_real8" -a "x$cctk_cv_have_fortran_complex16" = 'xyes' ; then cat >> confdefs.h <<EOF #define CCTK_REAL8 $CCTK_REAL8 EOF @@ -4595,7 +4945,7 @@ EOF fi -if test -n "$CCTK_REAL4" ; then +if test -n "$CCTK_REAL4" -a "x$cctk_cv_have_fortran_real4" = 'xyes' -a "x$cctk_cv_have_fortran_complex8" = 'xyes' ; then cat >> confdefs.h <<EOF #define CCTK_REAL4 $CCTK_REAL4 EOF @@ -4743,135 +5093,6 @@ LDFLAGS="$LDFLAGS $KNOWN_LDFLAGS" : ${FCOMPILEONLY='-c -o'} -####################################################################### -# determine DEBUG_MODE from the DEBUG option -# if this option isn't set DEBUG_MODE will default to 'no' -if test -n "$DEBUG" ; then - - DEBUG=`echo $DEBUG | tr '[:upper:]' '[:lower:]'` - -fi - -if test -n "$DEBUG" -a "$DEBUG" != 'no' ; then - cat >> confdefs.h <<\EOF -#define CCTK_DEBUG 1 -EOF - - case "$DEBUG" in - memory) - cat >> confdefs.h <<\EOF -#define CCTK_TRACEMEMORY 1 -EOF - - ;; - flags|yes) - DEBUG_FLAGS='yes' - ;; - defines) - cat >> confdefs.h <<\EOF -#define DEBUG 1 -EOF - - ;; - all) - cat >> confdefs.h <<\EOF -#define CCTK_TRACEMEMORY 1 -EOF - - DEBUG_FLAGS='yes' - ;; - *) - { echo "configure: error: Didn't recognize setting of DEBUG=\"$DEBUG\"" 1>&2; exit 1; } - ;; - esac -fi - - -DEBUG_MODE='no' -if test -n "$DEBUG_FLAGS"; then - DEBUG_MODE=$DEBUG_FLAGS -fi - -# Set the debug flags if they've not been set by now -# (using '-g' as a reasonable default) - -: ${C_DEBUG_FLAGS='-g'} - - -: ${CXX_DEBUG_FLAGS='-g'} - - -: ${F77_DEBUG_FLAGS='-g'} - - -: ${F90_DEBUG_FLAGS='-g'} - -# Set the warn flags - - -# Set the warning flags if they've not been set by now -# (using GNU compiler warning flags as a reasonable default) - -if test -z "$C_WARN_FLAGS" -a "$CC" = 'gcc' ; then - C_WARN_FLAGS='-Wall -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Winline' -else - : ${C_WARN_FLAGS=''} -fi - - -if test -z "$CXX_WARN_FLAGS" -a \( "$CXX" = 'c++' -o "$CXX" = 'g++' \) ; then - CXX_WARN_FLAGS='-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Winline -Woverloaded-virtual' -else - : ${CXX_WARN_FLAGS=''} -fi - - -if test -z "$F77_WARN_FLAGS" -a "$F77" = 'g77' ; then - F77_WARN_FLAGS='-Wall' -else - : ${F77_WARN_FLAGS=''} -fi - - -: ${F90_WARN_FLAGS=''} - -# Set the optimization flags if they've not been set by now -# (using '-O2' as a reasonable default) - - - -: ${C_OPTIMISE_FLAGS='-O2'} - - -: ${CXX_OPTIMISE_FLAGS='-O2'} - - -if test -z "$F77_OPTIMISE_FLAGS" -a "$F77" = 'g77' ; then - F77_OPTIMISE_FLAGS='-O2' -else - : ${F77_OPTIMISE_FLAGS=''} -fi - - -: ${F90_OPTIMISE_FLAGS=''} - -# Set the profiling flags if they've not been set by now -# (using '-pg' as a reasonable default) - - - -: ${C_PROFILE_FLAGS='-pg'} - - -: ${CXX_PROFILE_FLAGS='-pg'} - - -: ${F77_PROFILE_FLAGS='-pg'} - - -: ${F90_PROFILE_FLAGS='-pg'} - - # Set the createexe flag if it's not been set by now : ${CREATEEXE='-o'} @@ -5025,7 +5246,7 @@ if test "x$CCTK_NEED_X" = 'xyes' ; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5029: checking for X" >&5 +echo "configure:5250: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5087,12 +5308,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 5091 "configure" +#line 5312 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5161,14 +5382,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 5165 "configure" +#line 5386 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:5172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5428,6 +5649,26 @@ s%@F77@%$F77%g s%@AR@%$AR%g s%@MKDIR@%$MKDIR%g s%@LD@%$LD%g +s%@WARN_MODE@%$WARN_MODE%g +s%@C_WARN_FLAGS@%$C_WARN_FLAGS%g +s%@CXX_WARN_FLAGS@%$CXX_WARN_FLAGS%g +s%@F77_WARN_FLAGS@%$F77_WARN_FLAGS%g +s%@F90_WARN_FLAGS@%$F90_WARN_FLAGS%g +s%@DEBUG_MODE@%$DEBUG_MODE%g +s%@C_DEBUG_FLAGS@%$C_DEBUG_FLAGS%g +s%@CXX_DEBUG_FLAGS@%$CXX_DEBUG_FLAGS%g +s%@F77_DEBUG_FLAGS@%$F77_DEBUG_FLAGS%g +s%@F90_DEBUG_FLAGS@%$F90_DEBUG_FLAGS%g +s%@OPTIMISE_MODE@%$OPTIMISE_MODE%g +s%@C_OPTIMISE_FLAGS@%$C_OPTIMISE_FLAGS%g +s%@CXX_OPTIMISE_FLAGS@%$CXX_OPTIMISE_FLAGS%g +s%@F77_OPTIMISE_FLAGS@%$F77_OPTIMISE_FLAGS%g +s%@F90_OPTIMISE_FLAGS@%$F90_OPTIMISE_FLAGS%g +s%@PROFILE_MODE@%$PROFILE_MODE%g +s%@C_PROFILE_FLAGS@%$C_PROFILE_FLAGS%g +s%@CXX_PROFILE_FLAGS@%$CXX_PROFILE_FLAGS%g +s%@F77_PROFILE_FLAGS@%$F77_PROFILE_FLAGS%g +s%@F90_PROFILE_FLAGS@%$F90_PROFILE_FLAGS%g s%@ARFLAGS@%$ARFLAGS%g s%@USE_RANLIB@%$USE_RANLIB%g s%@RANLIBFLAGS@%$RANLIBFLAGS%g @@ -5456,26 +5697,6 @@ s%@F_FILE_PROCESSOR@%$F_FILE_PROCESSOR%g s%@C_FILE_PROCESSOR@%$C_FILE_PROCESSOR%g s%@CCOMPILEONLY@%$CCOMPILEONLY%g s%@FCOMPILEONLY@%$FCOMPILEONLY%g -s%@DEBUG_MODE@%$DEBUG_MODE%g -s%@C_DEBUG_FLAGS@%$C_DEBUG_FLAGS%g -s%@CXX_DEBUG_FLAGS@%$CXX_DEBUG_FLAGS%g -s%@F77_DEBUG_FLAGS@%$F77_DEBUG_FLAGS%g -s%@F90_DEBUG_FLAGS@%$F90_DEBUG_FLAGS%g -s%@WARN_MODE@%$WARN_MODE%g -s%@C_WARN_FLAGS@%$C_WARN_FLAGS%g -s%@CXX_WARN_FLAGS@%$CXX_WARN_FLAGS%g -s%@F77_WARN_FLAGS@%$F77_WARN_FLAGS%g -s%@F90_WARN_FLAGS@%$F90_WARN_FLAGS%g -s%@OPTIMISE_MODE@%$OPTIMISE_MODE%g -s%@C_OPTIMISE_FLAGS@%$C_OPTIMISE_FLAGS%g -s%@CXX_OPTIMISE_FLAGS@%$CXX_OPTIMISE_FLAGS%g -s%@F77_OPTIMISE_FLAGS@%$F77_OPTIMISE_FLAGS%g -s%@F90_OPTIMISE_FLAGS@%$F90_OPTIMISE_FLAGS%g -s%@PROFILE_MODE@%$PROFILE_MODE%g -s%@C_PROFILE_FLAGS@%$C_PROFILE_FLAGS%g -s%@CXX_PROFILE_FLAGS@%$CXX_PROFILE_FLAGS%g -s%@F77_PROFILE_FLAGS@%$F77_PROFILE_FLAGS%g -s%@F90_PROFILE_FLAGS@%$F90_PROFILE_FLAGS%g s%@CREATEEXE@%$CREATEEXE%g s%@DIRSEP@%$DIRSEP%g s%@OPTIONSEP@%$OPTIONSEP%g diff --git a/lib/make/configure.in b/lib/make/configure.in index 7bc0985f..848cdc78 100644 --- a/lib/make/configure.in +++ b/lib/make/configure.in @@ -19,6 +19,7 @@ dnl Starts here AC_INIT() AC_CONFIG_HEADER(cctk_Config.h) + ####################################################################### # determine WARN_MODE from the WARN option # if this option isn't set WARN_MODE will default to 'no' @@ -36,6 +37,38 @@ fi ####################################################################### +# determine DEBUG_MODE from the DEBUG option +# if this option isn't set DEBUG_MODE will default to 'no' +if test -n "$DEBUG" ; then + changequote({, }) + DEBUG=`echo $DEBUG | tr '[:upper:]' '[:lower:]'` + changequote([, ]) +fi + +if test -n "$DEBUG" -a "$DEBUG" != 'no' ; then + AC_DEFINE(CCTK_DEBUG) + case "$DEBUG" in + memory) + AC_DEFINE(CCTK_TRACEMEMORY) + ;; + flags|yes) + DEBUG_FLAGS='yes' + ;; + defines) + AC_DEFINE(DEBUG) + ;; + all) + AC_DEFINE(CCTK_TRACEMEMORY) + DEBUG_FLAGS='yes' + ;; + *) + AC_ERROR(Didn't recognize setting of DEBUG=\"$DEBUG\") + ;; + esac +fi + + +####################################################################### # determine OPTIMISE_MODE from the OPTIMISE/OPTIMIZE option # if this option isn't set OPTIMISE_MODE will default to 'yes' @@ -212,14 +245,105 @@ fi # Finish the architecture stuff CCTK_WriteLine cctk_Archdefs.h '#endif /* _CCTK_ARCHDEFS_H_ */' + + +# Set the warn flags +AC_SUBST(WARN_MODE) + +# Set the warning flags if they've not been set by now +# (using GNU compiler warning flags as a reasonable default) +AC_SUBST(C_WARN_FLAGS) +if test -z "$C_WARN_FLAGS" -a "$CC" = 'gcc' ; then + C_WARN_FLAGS='-Wall -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Winline' +else + : ${C_WARN_FLAGS=''} +fi + +AC_SUBST(CXX_WARN_FLAGS) +if test -z "$CXX_WARN_FLAGS" -a \( "$CXX" = 'c++' -o "$CXX" = 'g++' \) ; then + CXX_WARN_FLAGS='-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Winline -Woverloaded-virtual' +else + : ${CXX_WARN_FLAGS=''} +fi + +AC_SUBST(F77_WARN_FLAGS) +if test -z "$F77_WARN_FLAGS" -a "$F77" = 'g77' ; then + F77_WARN_FLAGS='-Wall' +else + : ${F77_WARN_FLAGS=''} +fi + +AC_SUBST(F90_WARN_FLAGS) +: ${F90_WARN_FLAGS=''} + + +AC_SUBST(DEBUG_MODE) +DEBUG_MODE='no' +if test -n "$DEBUG_FLAGS"; then + DEBUG_MODE=$DEBUG_FLAGS +fi + +# Set the debug flags if they've not been set by now +# (using '-g' as a reasonable default) +AC_SUBST(C_DEBUG_FLAGS) +: ${C_DEBUG_FLAGS='-g'} + +AC_SUBST(CXX_DEBUG_FLAGS) +: ${CXX_DEBUG_FLAGS='-g'} + +AC_SUBST(F77_DEBUG_FLAGS) +: ${F77_DEBUG_FLAGS='-g'} + +AC_SUBST(F90_DEBUG_FLAGS) +: ${F90_DEBUG_FLAGS='-g'} + + +# Set the optimization flags if they've not been set by now +# (using '-O2' as a reasonable default) +AC_SUBST(OPTIMISE_MODE) + +AC_SUBST(C_OPTIMISE_FLAGS) +: ${C_OPTIMISE_FLAGS='-O2'} + +AC_SUBST(CXX_OPTIMISE_FLAGS) +: ${CXX_OPTIMISE_FLAGS='-O2'} + +AC_SUBST(F77_OPTIMISE_FLAGS) +if test -z "$F77_OPTIMISE_FLAGS" -a "$F77" = 'g77' ; then + F77_OPTIMISE_FLAGS='-O2' +else + : ${F77_OPTIMISE_FLAGS=''} +fi + +AC_SUBST(F90_OPTIMISE_FLAGS) +: ${F90_OPTIMISE_FLAGS=''} + + +# Set the profiling flags if they've not been set by now +# (using '-pg' as a reasonable default) +AC_SUBST(PROFILE_MODE) + +AC_SUBST(C_PROFILE_FLAGS) +: ${C_PROFILE_FLAGS='-pg'} + +AC_SUBST(CXX_PROFILE_FLAGS) +: ${CXX_PROFILE_FLAGS='-pg'} + +AC_SUBST(F77_PROFILE_FLAGS) +: ${F77_PROFILE_FLAGS='-pg'} + +AC_SUBST(F90_PROFILE_FLAGS) +: ${F90_PROFILE_FLAGS='-pg'} + ########################################################################## -######################################################################### # The known architecture stuff has probably set the LIBS variable # So remember what it is and set it to blank to prevent any problems with the # rest of the configure stuff. +######################################################################### + KNOWN_LIBS="$LIBS" unset LIBS @@ -535,11 +659,13 @@ CCTK_CHECK_CXX_RESTRICT CCTK_C_BOOL CCTK_CXX_BOOL -CCTK_PROG_FORTRAN_REAL16_WORKS -AC_PROG_CXX_GNU -if test "$fortran_does_real16" = 'yes'; then - AC_DEFINE(HAVE_FORTRAN_REAL16) -fi +CCTK_FORTRAN_REAL4 +CCTK_FORTRAN_REAL8 +CCTK_FORTRAN_REAL16 + +CCTK_FORTRAN_COMPLEX8 +CCTK_FORTRAN_COMPLEX16 +CCTK_FORTRAN_COMPLEX32 dnl Do we have crypt(3) CCTK_CHECK_FUNC(crypt, , CCTK_CHECK_LIB_FUNC(crypt, crypt)) @@ -659,10 +785,6 @@ if test -n "$CCTK_INT1" ; then fi # Float types -echo "Float types" -echo "x$ac_cv_sizeof_long_double" -echo "x$ac_cv_sizeof_double" -echo "x$ac_cv_sizeof_float" case "x$ac_cv_sizeof_long_double" in 'x16') CCTK_REAL16='long double' ;; @@ -694,17 +816,17 @@ if test "x$DISABLE_REAL16" != 'xyes' -a "x$DISABLE_REAL16" != 'xno' -a "x$DISABL AC_ERROR([Didn't recognise setting of DISABLE_REAL16=\"$DISABLE_REAL16\"; should be either \"yes\" or \"no\" or \"\" (empty)]) fi -if test -n "$CCTK_REAL16" -a "x$DISABLE_REAL16" != 'xyes' -a -n "$HAVE_FORTRAN_REAL16" ; then +if test -n "$CCTK_REAL16" -a "x$cctk_cv_have_fortran_real16" = 'xyes' -a "x$cctk_cv_have_fortran_complex32" = 'xyes' -a "x$DISABLE_REAL16" != 'xyes' ; then AC_DEFINE_UNQUOTED(CCTK_REAL16, $CCTK_REAL16) AC_DEFINE(HAVE_CCTK_REAL16) fi -if test -n "$CCTK_REAL8" ; then +if test -n "$CCTK_REAL8" -a "x$cctk_cv_have_fortran_real8" -a "x$cctk_cv_have_fortran_complex16" = 'xyes' ; then AC_DEFINE_UNQUOTED(CCTK_REAL8, $CCTK_REAL8) AC_DEFINE(HAVE_CCTK_REAL8) fi -if test -n "$CCTK_REAL4" ; then +if test -n "$CCTK_REAL4" -a "x$cctk_cv_have_fortran_real4" = 'xyes' -a "x$cctk_cv_have_fortran_complex8" = 'xyes' ; then AC_DEFINE_UNQUOTED(CCTK_REAL4, $CCTK_REAL4) AC_DEFINE(HAVE_CCTK_REAL4) fi @@ -807,123 +929,6 @@ AC_SUBST(FCOMPILEONLY) : ${FCOMPILEONLY='-c -o'} -####################################################################### -# determine DEBUG_MODE from the DEBUG option -# if this option isn't set DEBUG_MODE will default to 'no' -if test -n "$DEBUG" ; then - changequote({, }) - DEBUG=`echo $DEBUG | tr '[:upper:]' '[:lower:]'` - changequote([, ]) -fi - -if test -n "$DEBUG" -a "$DEBUG" != 'no' ; then - AC_DEFINE(CCTK_DEBUG) - case "$DEBUG" in - memory) - AC_DEFINE(CCTK_TRACEMEMORY) - ;; - flags|yes) - DEBUG_FLAGS='yes' - ;; - defines) - AC_DEFINE(DEBUG) - ;; - all) - AC_DEFINE(CCTK_TRACEMEMORY) - DEBUG_FLAGS='yes' - ;; - *) - AC_ERROR(Didn't recognize setting of DEBUG=\"$DEBUG\") - ;; - esac -fi - -AC_SUBST(DEBUG_MODE) -DEBUG_MODE='no' -if test -n "$DEBUG_FLAGS"; then - DEBUG_MODE=$DEBUG_FLAGS -fi - -# Set the debug flags if they've not been set by now -# (using '-g' as a reasonable default) -AC_SUBST(C_DEBUG_FLAGS) -: ${C_DEBUG_FLAGS='-g'} - -AC_SUBST(CXX_DEBUG_FLAGS) -: ${CXX_DEBUG_FLAGS='-g'} - -AC_SUBST(F77_DEBUG_FLAGS) -: ${F77_DEBUG_FLAGS='-g'} - -AC_SUBST(F90_DEBUG_FLAGS) -: ${F90_DEBUG_FLAGS='-g'} - -# Set the warn flags -AC_SUBST(WARN_MODE) - -# Set the warning flags if they've not been set by now -# (using GNU compiler warning flags as a reasonable default) -AC_SUBST(C_WARN_FLAGS) -if test -z "$C_WARN_FLAGS" -a "$CC" = 'gcc' ; then - C_WARN_FLAGS='-Wall -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Winline' -else - : ${C_WARN_FLAGS=''} -fi - -AC_SUBST(CXX_WARN_FLAGS) -if test -z "$CXX_WARN_FLAGS" -a \( "$CXX" = 'c++' -o "$CXX" = 'g++' \) ; then - CXX_WARN_FLAGS='-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Winline -Woverloaded-virtual' -else - : ${CXX_WARN_FLAGS=''} -fi - -AC_SUBST(F77_WARN_FLAGS) -if test -z "$F77_WARN_FLAGS" -a "$F77" = 'g77' ; then - F77_WARN_FLAGS='-Wall' -else - : ${F77_WARN_FLAGS=''} -fi - -AC_SUBST(F90_WARN_FLAGS) -: ${F90_WARN_FLAGS=''} - -# Set the optimization flags if they've not been set by now -# (using '-O2' as a reasonable default) -AC_SUBST(OPTIMISE_MODE) - -AC_SUBST(C_OPTIMISE_FLAGS) -: ${C_OPTIMISE_FLAGS='-O2'} - -AC_SUBST(CXX_OPTIMISE_FLAGS) -: ${CXX_OPTIMISE_FLAGS='-O2'} - -AC_SUBST(F77_OPTIMISE_FLAGS) -if test -z "$F77_OPTIMISE_FLAGS" -a "$F77" = 'g77' ; then - F77_OPTIMISE_FLAGS='-O2' -else - : ${F77_OPTIMISE_FLAGS=''} -fi - -AC_SUBST(F90_OPTIMISE_FLAGS) -: ${F90_OPTIMISE_FLAGS=''} - -# Set the profiling flags if they've not been set by now -# (using '-pg' as a reasonable default) -AC_SUBST(PROFILE_MODE) - -AC_SUBST(C_PROFILE_FLAGS) -: ${C_PROFILE_FLAGS='-pg'} - -AC_SUBST(CXX_PROFILE_FLAGS) -: ${CXX_PROFILE_FLAGS='-pg'} - -AC_SUBST(F77_PROFILE_FLAGS) -: ${F77_PROFILE_FLAGS='-pg'} - -AC_SUBST(F90_PROFILE_FLAGS) -: ${F90_PROFILE_FLAGS='-pg'} - - # Set the createexe flag if it's not been set by now AC_SUBST(CREATEEXE) : ${CREATEEXE='-o'} diff --git a/lib/make/force-reconfigure b/lib/make/force-reconfigure index 2b503b2f..0d2245c5 100644 --- a/lib/make/force-reconfigure +++ b/lib/make/force-reconfigure @@ -5,7 +5,7 @@ # @desc # Timestamp file for forcing reconfiguring configurations # @enddesc -# @version $Id: force-reconfigure,v 1.9 2006-03-10 10:21:06 tradke Exp $ +# @version $Id: force-reconfigure,v 1.10 2006-07-19 11:02:36 schnetter Exp $ # @@*/ 31 Mar 2004: created @@ -16,3 +16,4 @@ 07 Oct 2004: change HDF5 to CCTK_HDF5 in cctk_Config.h 08 Nov 2004: add HAVE_HDF5_STREAM_VFD and HDF5_LFS_FLAGS makefile variables 10 Mar 2006: fix order of external/system libs on the linker command line +19 Jul 2006: detect presence of real*16 in Fortran correctly |