From a08107a97d6bda1ffcc7dcdc8e80ccd58f076134 Mon Sep 17 00:00:00 2001 From: knarf Date: Mon, 7 Feb 2011 21:51:49 +0000 Subject: add CUDA support to the flesh git-svn-id: http://svn.cactuscode.org/flesh/trunk@4684 17b73243-c579-4c4c-a9d2-2d5706c11dac --- lib/make/configure | 683 +++++++++++++++++++++++------------------- lib/make/configure.in | 27 ++ lib/make/make.config.defn.in | 18 ++ lib/make/make.config.rules.in | 33 ++ 4 files changed, 454 insertions(+), 307 deletions(-) diff --git a/lib/make/configure b/lib/make/configure index 0c9a51a9..d017eefc 100755 --- a/lib/make/configure +++ b/lib/make/configure @@ -26,6 +26,7 @@ + # CCTK_CHECK_FUNCS(FUNCTION..., [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) @@ -792,7 +793,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:796: checking host system type" >&5 +echo "configure:797: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -838,7 +839,7 @@ if test -n "$LIBS" ; then fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:842: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:843: 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 @@ -871,7 +872,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:875: checking for $ac_word" >&5 +echo "configure:876: 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 @@ -903,7 +904,7 @@ done fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:907: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:908: 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. @@ -915,12 +916,12 @@ cross_compiling=$ac_cv_prog_cc_cross rm -fr conftest* cat > conftest.$ac_ext << EOF -#line 919 "configure" +#line 920 "configure" #include "confdefs.h" main(){return(0);} int PilotMain(){return(0);} EOF -if { (eval echo configure:924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:925: \"$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>&5; then @@ -949,7 +950,7 @@ fi CROSS_COMPILE=`echo $CROSS_COMPILE | tr '[:upper:]' '[:lower:]'` echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:953: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:954: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 if test $ac_cv_prog_cc_cross = yes -a "x$CROSS_COMPILE" != xyes; then { echo "configure: error: Could not run executable generated by C compiler (see configs//config-data/config.log for details). If this is a cross configuration please set CROSS_COMPILE=yes." 1>&2; exit 1; } @@ -957,7 +958,7 @@ fi cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:961: checking whether we are using GNU C" >&5 +echo "configure:962: 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 @@ -966,7 +967,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:970: \"$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:971: \"$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 @@ -982,7 +983,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:986: checking for $ac_word" >&5 +echo "configure:987: 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 @@ -1014,7 +1015,7 @@ done fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1018: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1019: 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. @@ -1026,12 +1027,12 @@ cross_compiling=$ac_cv_prog_cxx_cross rm -fr conftest* cat > conftest.$ac_ext << EOF -#line 1030 "configure" +#line 1031 "configure" #include "confdefs.h" int main(){return(0);} extern "C" int PilotMain(){return(0);} EOF -if { (eval echo configure:1035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1036: \"$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>&5; then @@ -1057,7 +1058,7 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables (see configs//config-data/config.log for details)." 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:1061: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1062: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 if test $ac_cv_prog_cxx_cross = yes -a "x$CROSS_COMPILE" != xyes; then { echo "configure: error: Could not run executable generated by C++ compiler (see configs//config-data/config.log for details). If this is a cross configuration please set CROSS_COMPILE=yes." 1>&2; exit 1; } @@ -1065,7 +1066,7 @@ fi cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1069: checking whether we are using GNU C++" >&5 +echo "configure:1070: 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 @@ -1074,7 +1075,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1078: \"$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:1079: \"$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 @@ -1088,7 +1089,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:1092: checking for $ac_word" >&5 +echo "configure:1093: 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 @@ -1124,7 +1125,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:1128: checking for $ac_word" >&5 +echo "configure:1129: 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 @@ -1170,7 +1171,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:1174: checking for $ac_word" >&5 +echo "configure:1175: 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 @@ -1208,13 +1209,50 @@ test -n "$FPP" || FPP="echo" fi +if test -z "$NVCC" ; then + for ac_prog in nvcc +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:1219: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_NVCC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$NVCC"; then + ac_cv_prog_NVCC="$NVCC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_NVCC="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +NVCC="$ac_cv_prog_NVCC" +if test -n "$NVCC"; then + echo "$ac_t""$NVCC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$NVCC" && break +done + +fi + if test -z "$PERL" ; then for ac_prog in perl 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:1218: checking for $ac_word" >&5 +echo "configure:1256: 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 @@ -1251,7 +1289,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:1255: checking for $ac_word" >&5 +echo "configure:1293: 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 @@ -1288,7 +1326,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:1292: checking for $ac_word" >&5 +echo "configure:1330: 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 @@ -1325,7 +1363,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:1329: checking for $ac_word" >&5 +echo "configure:1367: 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 @@ -1362,7 +1400,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:1366: checking for $ac_word" >&5 +echo "configure:1404: 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 @@ -1401,7 +1439,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:1405: checking for $ac_word" >&5 +echo "configure:1443: 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 @@ -1529,6 +1567,9 @@ else : ${F90_WARN_FLAGS=''} fi +# nvcc itself doesn't have warning flags. warnings will be given by C compilers. + + : ${NVCC_WARN_FLAGS=''} DEBUG_MODE='no' @@ -1557,6 +1598,8 @@ fi : ${F90_DEBUG_FLAGS='-g'} +: ${NVCC_DEBUG_FLAGS='-g'} + # Set the optimization flags if they've not been set by now # (using '-O2' as a reasonable default) @@ -1596,6 +1639,8 @@ fi : ${F90_NO_OPTIMISE_FLAGS='-O0'} +: ${NVCC_OPTIMISE_FLAGS='-O2'} + # Set the profiling flags if they've not been set by now # (using '-pg' as a reasonable default) @@ -1619,6 +1664,8 @@ fi : ${F90_PROFILE_FLAGS='-pg'} +: ${NVCC_PROFILE_FLAGS='-pg'} + # Set the OpenMP flags if they've not been set by now @@ -1629,6 +1676,7 @@ fi + ########################################################################## # Deal with the Fortran compiler issues. @@ -1682,7 +1730,7 @@ unset LDFLAGS echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1686: checking how to run the C preprocessor" >&5 +echo "configure:1734: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1697,13 +1745,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1755: \"$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 : @@ -1714,13 +1762,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1772: \"$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 : @@ -1731,13 +1779,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1789: \"$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 : @@ -1762,12 +1810,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1766: checking for ANSI C header files" >&5 +echo "configure:1814: 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 < #include @@ -1775,7 +1823,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1827: \"$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* @@ -1792,7 +1840,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 @@ -1810,7 +1858,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 @@ -1831,7 +1879,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1842,7 +1890,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1869,14 +1917,14 @@ fi if test "x$cross_compiling" = 'xno' ; then echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1873: checking whether byte ordering is bigendian" >&5 +echo "configure:1921: 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 < #include @@ -1887,11 +1935,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1939: \"$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 < #include @@ -1902,7 +1950,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1922,7 +1970,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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1987: \"$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 @@ -1978,7 +2026,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:1982: checking size of long long" >&5 +echo "configure:2030: 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 @@ -1986,7 +2034,7 @@ else ac_cv_sizeof_long_long=$SIZEOF_LONG_LONG else cat > conftest.$ac_ext < #include @@ -1998,7 +2046,7 @@ main() exit(0); } EOF -if { (eval echo configure:2002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2050: \"$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 @@ -2023,7 +2071,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:2027: checking size of long int" >&5 +echo "configure:2075: 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 @@ -2031,7 +2079,7 @@ else ac_cv_sizeof_long_int=$SIZEOF_LONG_INT else cat > conftest.$ac_ext < #include @@ -2043,7 +2091,7 @@ main() exit(0); } EOF -if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2095: \"$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 @@ -2068,7 +2116,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:2072: checking size of int" >&5 +echo "configure:2120: 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 @@ -2076,7 +2124,7 @@ else ac_cv_sizeof_int=$SIZEOF_INT else cat > conftest.$ac_ext < #include @@ -2088,7 +2136,7 @@ main() exit(0); } EOF -if { (eval echo configure:2092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2140: \"$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 @@ -2113,7 +2161,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:2117: checking size of short int" >&5 +echo "configure:2165: 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 @@ -2121,7 +2169,7 @@ else ac_cv_sizeof_short_int=$SIZEOF_SHORT_INT else cat > conftest.$ac_ext < #include @@ -2133,7 +2181,7 @@ main() exit(0); } EOF -if { (eval echo configure:2137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2185: \"$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 @@ -2160,7 +2208,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:2164: checking size of long double" >&5 +echo "configure:2212: 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 @@ -2168,7 +2216,7 @@ else ac_cv_sizeof_long_double=$SIZEOF_LONG_DOUBLE else cat > conftest.$ac_ext < #include @@ -2180,7 +2228,7 @@ main() exit(0); } EOF -if { (eval echo configure:2184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2232: \"$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 @@ -2205,7 +2253,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:2209: checking size of double" >&5 +echo "configure:2257: 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 @@ -2213,7 +2261,7 @@ else ac_cv_sizeof_double=$SIZEOF_DOUBLE else cat > conftest.$ac_ext < #include @@ -2225,7 +2273,7 @@ main() exit(0); } EOF -if { (eval echo configure:2229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2277: \"$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 @@ -2251,7 +2299,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:2255: checking size of float" >&5 +echo "configure:2303: 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 @@ -2259,7 +2307,7 @@ else ac_cv_sizeof_float=$SIZEOF_FLOAT else cat > conftest.$ac_ext < #include @@ -2271,7 +2319,7 @@ main() exit(0); } EOF -if { (eval echo configure:2275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2323: \"$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 @@ -2298,7 +2346,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:2302: checking size of char *" >&5 +echo "configure:2350: 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 @@ -2306,7 +2354,7 @@ else ac_cv_sizeof_char_p=$SIZEOF_POINTER else cat > conftest.$ac_ext < #include @@ -2318,7 +2366,7 @@ main() exit(0); } EOF -if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2370: \"$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 @@ -2353,7 +2401,7 @@ EOF else echo $ac_n "checking for the null device""... $ac_c" 1>&6 -echo "configure:2357: checking for the null device" >&5 +echo "configure:2405: 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 @@ -2399,6 +2447,7 @@ fi + #: ${F90FLAGS="$CFLAGS"} #: ${F77FLAGS="$CFLAGS"} @@ -2410,18 +2459,19 @@ fi + # Do we have gethostbyname(3) ? # For Solaris we should search in libnsl.so 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' for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2420: checking for $ac_func" >&5 +echo "configure:2470: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2498: \"$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 @@ -2466,7 +2516,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in library nsl""... $ac_c" 1>&6 -echo "configure:2470: checking for gethostbyname in library nsl" >&5 +echo "configure:2520: 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 @@ -2475,7 +2525,7 @@ else ac_save_LIBS="$LIBS" LIBS="nsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2540: \"$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 @@ -2517,12 +2567,12 @@ done # Check if we have mode_t available echo $ac_n "checking whether mode_t is defined""... $ac_c" 1>&6 -echo "configure:2521: checking whether mode_t is defined" >&5 +echo "configure:2571: checking whether 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 < #include @@ -2532,7 +2582,7 @@ int main() { mode_t foo; return 0 ; return 0; } EOF -if { (eval echo configure:2536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have_mode_t=yes" else @@ -2558,12 +2608,12 @@ fi echo $ac_n "checking for availability of gettimeofday timing""... $ac_c" 1>&6 -echo "configure:2562: checking for availability of gettimeofday timing" >&5 +echo "configure:2612: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2625: \"$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 @@ -2593,12 +2643,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:2597: checking if gettimeofday needs timezone" >&5 +echo "configure:2647: 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 < #include @@ -2611,7 +2661,7 @@ struct timeval tp; return 0; ; return 0; } EOF -if { (eval echo configure:2615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2665: \"$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 @@ -2634,12 +2684,12 @@ fi fi echo $ac_n "checking for availability of getrusage timing""... $ac_c" 1>&6 -echo "configure:2638: checking for availability of getrusage timing" >&5 +echo "configure:2688: 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 < #include @@ -2652,7 +2702,7 @@ struct rusage ru; return 0; ; return 0; } EOF -if { (eval echo configure:2656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2706: \"$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 @@ -2674,12 +2724,12 @@ else fi echo $ac_n "checking for availability of _ftime timing""... $ac_c" 1>&6 -echo "configure:2678: checking for availability of _ftime timing" >&5 +echo "configure:2728: 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 < #include @@ -2692,7 +2742,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:2696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2746: \"$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 @@ -2719,12 +2769,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:2723: checking for $cctk_hdr" >&5 +echo "configure:2773: 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 < @@ -2732,7 +2782,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2759,12 +2809,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:2763: checking for $cctk_hdr" >&5 +echo "configure:2813: 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 < @@ -2772,7 +2822,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2799,12 +2849,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:2803: checking for $cctk_hdr" >&5 +echo "configure:2853: 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 < @@ -2812,7 +2862,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2839,12 +2889,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:2843: checking for $cctk_hdr" >&5 +echo "configure:2893: 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 < @@ -2852,7 +2902,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2879,12 +2929,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:2883: checking for $cctk_hdr" >&5 +echo "configure:2933: 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 < @@ -2892,7 +2942,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2919,12 +2969,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:2923: checking for $cctk_hdr" >&5 +echo "configure:2973: 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 < @@ -2932,7 +2982,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2959,12 +3009,12 @@ for cctk_hdr in tgmath.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:2963: checking for $cctk_hdr" >&5 +echo "configure:3013: 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 < @@ -2972,7 +3022,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2999,12 +3049,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:3003: checking for $cctk_hdr" >&5 +echo "configure:3053: 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 < @@ -3012,7 +3062,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3039,12 +3089,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:3043: checking for $cctk_hdr" >&5 +echo "configure:3093: 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 < @@ -3052,7 +3102,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3079,12 +3129,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:3083: checking for $cctk_hdr" >&5 +echo "configure:3133: 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 < @@ -3092,7 +3142,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3119,12 +3169,12 @@ for cctk_hdr in c_asm.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:3123: checking for $cctk_hdr" >&5 +echo "configure:3173: 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 < @@ -3132,7 +3182,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3159,12 +3209,12 @@ for cctk_hdr in intrinsics.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:3163: checking for $cctk_hdr" >&5 +echo "configure:3213: 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 < @@ -3172,7 +3222,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3199,12 +3249,12 @@ for cctk_hdr in mach/mach_time.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:3203: checking for $cctk_hdr" >&5 +echo "configure:3253: 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 < @@ -3212,7 +3262,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3236,12 +3286,12 @@ fi done echo $ac_n "checking for regex.h""... $ac_c" 1>&6 -echo "configure:3240: checking for regex.h" >&5 +echo "configure:3290: 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 < #include @@ -3249,7 +3299,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:3253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_regex_h=yes" else @@ -3274,12 +3324,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:3278: checking for $cctk_hdr" >&5 +echo "configure:3328: 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 < @@ -3289,7 +3339,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3316,12 +3366,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:3320: checking for $cctk_hdr" >&5 +echo "configure:3370: 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 < @@ -3331,7 +3381,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3358,12 +3408,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:3362: checking for $cctk_hdr" >&5 +echo "configure:3412: 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 < @@ -3373,7 +3423,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3400,12 +3450,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:3404: checking for $cctk_hdr" >&5 +echo "configure:3454: 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 < @@ -3415,7 +3465,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3442,12 +3492,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:3446: checking for $cctk_hdr" >&5 +echo "configure:3496: 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 < @@ -3457,7 +3507,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3484,12 +3534,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:3488: checking for $cctk_hdr" >&5 +echo "configure:3538: 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 < @@ -3499,7 +3549,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3526,12 +3576,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:3530: checking for $cctk_hdr" >&5 +echo "configure:3580: 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 < @@ -3539,7 +3589,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3566,12 +3616,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:3570: checking for $cctk_hdr" >&5 +echo "configure:3620: 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 < @@ -3581,7 +3631,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3608,12 +3658,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:3612: checking for $cctk_hdr" >&5 +echo "configure:3662: 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 < @@ -3621,7 +3671,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3648,12 +3698,12 @@ for cctk_hdr in malloc.h do cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6 -echo "configure:3652: checking for $cctk_hdr" >&5 +echo "configure:3702: 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 < @@ -3661,7 +3711,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3686,12 +3736,12 @@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3690: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3740: 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 < #include @@ -3700,7 +3750,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3725,12 +3775,12 @@ fi # Check if we have socklen_t available echo $ac_n "checking whether socklen_t is defined""... $ac_c" 1>&6 -echo "configure:3729: checking whether socklen_t is defined" >&5 +echo "configure:3779: checking whether 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 < #include @@ -3750,7 +3800,7 @@ int main() { socklen_t foo; return 0 ; return 0; } EOF -if { (eval echo configure:3754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have_socklen_t=yes" else @@ -3775,12 +3825,12 @@ fi # Check if someone has defined SOCKET echo $ac_n "checking whether SOCKET is defined""... $ac_c" 1>&6 -echo "configure:3779: checking whether SOCKET is defined" >&5 +echo "configure:3829: checking whether 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 < #include @@ -3800,7 +3850,7 @@ int main() { SOCKET foo; return 0 ; return 0; } EOF -if { (eval echo configure:3804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have_SOCKET=yes" else @@ -3826,12 +3876,12 @@ fi # Check for timing functions echo $ac_n "checking for hrtime_t""... $ac_c" 1>&6 -echo "configure:3830: checking for hrtime_t" >&5 +echo "configure:3880: checking for hrtime_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_hrtime_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3862,12 +3912,12 @@ fi for ac_func in gethrtime read_real_time time_base_to_time clock_gettime mach_absolute_time do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3866: checking for $ac_func" >&5 +echo "configure:3916: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3944: \"$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 @@ -3916,10 +3966,10 @@ done echo $ac_n "checking for _rtc intrinsic""... $ac_c" 1>&6 -echo "configure:3920: checking for _rtc intrinsic" >&5 +echo "configure:3970: checking for _rtc intrinsic" >&5 rtc_ok=yes cat > conftest.$ac_ext < @@ -3928,7 +3978,7 @@ int main() { _rtc() ; return 0; } EOF -if { (eval echo configure:3932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE__RTC 1 @@ -3949,12 +3999,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in mallinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3953: checking for $ac_func" >&5 +echo "configure:4003: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4031: \"$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 @@ -4006,12 +4056,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in mallopt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4010: checking for $ac_func" >&5 +echo "configure:4060: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4088: \"$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 @@ -4062,12 +4112,12 @@ done # Check if M_MMAP_THRESHOLD is defined echo $ac_n "checking whether M_MMAP_THRESHOLD is defined""... $ac_c" 1>&6 -echo "configure:4066: checking whether M_MMAP_THRESHOLD is defined" >&5 +echo "configure:4116: checking whether M_MMAP_THRESHOLD is defined" >&5 if eval "test \"`echo '$''{'cctk_cv_have_M_MMAP_THRESHOLD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_MALLOC_H @@ -4077,7 +4127,7 @@ int main() { int x=M_MMAP_THRESHOLD; return 0 ; return 0; } EOF -if { (eval echo configure:4081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have_M_MMAP_THRESHOLD=yes" else @@ -4103,19 +4153,19 @@ fi # Check if we have __int64 echo $ac_n "checking if __int64 is defined""... $ac_c" 1>&6 -echo "configure:4107: checking if __int64 is defined" >&5 +echo "configure:4157: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have___int64=yes" else @@ -4150,12 +4200,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:4154: checking for $cctk_hdr" >&5 +echo "configure:4204: 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 < @@ -4163,7 +4213,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -4202,12 +4252,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:4206: checking for $ac_func" >&5 +echo "configure:4256: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4284: \"$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 @@ -4273,12 +4323,12 @@ else fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4277: checking for working const" >&5 +echo "configure:4327: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4349,14 +4399,14 @@ fi #AC_C_INLINE echo $ac_n "checking for C inline""... $ac_c" 1>&6 -echo "configure:4353: checking for C inline" >&5 +echo "configure:4403: checking for C inline" >&5 if eval "test \"`echo '$''{'cctk_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cctk_cv_c_inline=no for ac_kw in inline __inline__ __inline '__inline__ __attribute__((__gnu_inline__))'; do cat > conftest.$ac_ext < conftest2.$ac_ext <&5; (eval $ac_link conftest2.$ac_ext) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4425: \"$ac_link conftest2.$ac_ext\") 1>&5; (eval $ac_link conftest2.$ac_ext) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cctk_cv_c_inline=$ac_kw; break else @@ -4401,14 +4451,14 @@ EOF esac echo $ac_n "checking for C static inline""... $ac_c" 1>&6 -echo "configure:4405: checking for C static inline" >&5 +echo "configure:4455: checking for C static inline" >&5 if eval "test \"`echo '$''{'cctk_cv_c_static_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cctk_cv_c_static_inline=no for ac_kw in 'static inline' 'static __inline__' 'static __inline' 'static __inline__ __attribute__((__gnu_inline__))'; do cat > conftest.$ac_ext < conftest2.$ac_ext <&5; (eval $ac_link conftest2.$ac_ext) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4477: \"$ac_link conftest2.$ac_ext\") 1>&5; (eval $ac_link conftest2.$ac_ext) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cctk_cv_c_static_inline=$ac_kw; break else @@ -4449,14 +4499,14 @@ esac echo $ac_n "checking for C restrict""... $ac_c" 1>&6 -echo "configure:4453: checking for C restrict" >&5 +echo "configure:4503: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_c_restrict=$ac_kw; break else @@ -4498,7 +4548,7 @@ EOF esac echo $ac_n "checking for C++ restrict""... $ac_c" 1>&6 -echo "configure:4502: checking for C++ restrict" >&5 +echo "configure:4552: 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 @@ -4513,7 +4563,7 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_kw in restrict __restrict__ __restrict; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_cxx_restrict=$ac_kw; break else @@ -4562,20 +4612,20 @@ esac echo $ac_n "checking for C bool""... $ac_c" 1>&6 -echo "configure:4566: checking for C bool" >&5 +echo "configure:4616: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_c_bool=yes else @@ -4597,7 +4647,7 @@ EOF fi echo $ac_n "checking for CXX bool""... $ac_c" 1>&6 -echo "configure:4601: checking for CXX bool" >&5 +echo "configure:4651: 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 @@ -4611,14 +4661,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_cxx_bool=yes else @@ -4648,20 +4698,20 @@ fi echo $ac_n "checking for C _Pragma""... $ac_c" 1>&6 -echo "configure:4652: checking for C _Pragma" >&5 +echo "configure:4702: checking for C _Pragma" >&5 if eval "test \"`echo '$''{'cctk_cv_have_c__Pragma'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cctk_cv_have_c__Pragma=no cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_c__Pragma=yes else @@ -4699,20 +4749,20 @@ fi # Find out whether the C compiler supports __attribute__((noinline)) echo $ac_n "checking for C function __attribute__((__noinline__))""... $ac_c" 1>&6 -echo "configure:4703: checking for C function __attribute__((__noinline__))" >&5 +echo "configure:4753: checking for C function __attribute__((__noinline__))" >&5 if eval "test \"`echo '$''{'cctk_cv_have_c_attribute_noinline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cctk_cv_have_c_attribute_noinline=no cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_c_attribute_noinline=yes else @@ -4734,7 +4784,7 @@ EOF fi echo $ac_n "checking for CXX function __attribute__((__noinline__))""... $ac_c" 1>&6 -echo "configure:4738: checking for CXX function __attribute__((__noinline__))" >&5 +echo "configure:4788: checking for CXX function __attribute__((__noinline__))" >&5 if eval "test \"`echo '$''{'cctk_cv_have_cxx_attribute_noinline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4748,14 +4798,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_cxx_attribute_noinline=yes else @@ -4784,7 +4834,7 @@ EOF fi echo $ac_n "checking for CXX member function __attribute__((__noinline__))""... $ac_c" 1>&6 -echo "configure:4788: checking for CXX member function __attribute__((__noinline__))" >&5 +echo "configure:4838: checking for CXX member function __attribute__((__noinline__))" >&5 if eval "test \"`echo '$''{'cctk_cv_have_cxx_member_attribute_noinline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4798,14 +4848,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_cxx_member_attribute_noinline=yes else @@ -4836,20 +4886,20 @@ fi # Find out whether the C compiler supports __attribute__((unused)) echo $ac_n "checking for C __attribute__((__unused__))""... $ac_c" 1>&6 -echo "configure:4840: checking for C __attribute__((__unused__))" >&5 +echo "configure:4890: checking for C __attribute__((__unused__))" >&5 if eval "test \"`echo '$''{'cctk_cv_have_c_attribute_unused'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cctk_cv_have_c_attribute_unused=no cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_c_attribute_unused=yes else @@ -4871,7 +4921,7 @@ EOF fi echo $ac_n "checking for CXX __attribute__((__unused__))""... $ac_c" 1>&6 -echo "configure:4875: checking for CXX __attribute__((__unused__))" >&5 +echo "configure:4925: checking for CXX __attribute__((__unused__))" >&5 if eval "test \"`echo '$''{'cctk_cv_have_cxx_attribute_unused'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4885,14 +4935,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_cxx_attribute_unused=yes else @@ -4923,20 +4973,20 @@ fi # Find out whether the C compiler supports __attribute__((aligned(...))) echo $ac_n "checking for C __attribute__((__aligned__(...)))""... $ac_c" 1>&6 -echo "configure:4927: checking for C __attribute__((__aligned__(...)))" >&5 +echo "configure:4977: checking for C __attribute__((__aligned__(...)))" >&5 if eval "test \"`echo '$''{'cctk_cv_have_c_attribute_aligned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cctk_cv_have_c_attribute_aligned=no cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_c_attribute_aligned=yes else @@ -4958,7 +5008,7 @@ EOF fi echo $ac_n "checking for CXX __attribute__((__aligned__(...)))""... $ac_c" 1>&6 -echo "configure:4962: checking for CXX __attribute__((__aligned__(...)))" >&5 +echo "configure:5012: checking for CXX __attribute__((__aligned__(...)))" >&5 if eval "test \"`echo '$''{'cctk_cv_have_cxx_attribute_aligned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4972,14 +5022,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_cxx_attribute_aligned=yes else @@ -5017,7 +5067,7 @@ fi #CCTK_CXX_ATTRIBUTE_HOT echo $ac_n "checking for Fortran REAL*4""... $ac_c" 1>&6 -echo "configure:5021: checking for Fortran REAL*4" >&5 +echo "configure:5071: 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 @@ -5033,7 +5083,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_fortran_real4=yes else @@ -5062,7 +5112,7 @@ EOF fi echo $ac_n "checking for Fortran REAL*8""... $ac_c" 1>&6 -echo "configure:5066: checking for Fortran REAL*8" >&5 +echo "configure:5116: 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 @@ -5078,7 +5128,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_fortran_real8=yes else @@ -5107,7 +5157,7 @@ EOF fi echo $ac_n "checking for Fortran REAL*16""... $ac_c" 1>&6 -echo "configure:5111: checking for Fortran REAL*16" >&5 +echo "configure:5161: 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 @@ -5123,7 +5173,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_fortran_real16=yes else @@ -5153,7 +5203,7 @@ fi echo $ac_n "checking for Fortran COMPLEX*8""... $ac_c" 1>&6 -echo "configure:5157: checking for Fortran COMPLEX*8" >&5 +echo "configure:5207: 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 @@ -5169,7 +5219,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_fortran_complex8=yes else @@ -5198,7 +5248,7 @@ EOF fi echo $ac_n "checking for Fortran COMPLEX*16""... $ac_c" 1>&6 -echo "configure:5202: checking for Fortran COMPLEX*16" >&5 +echo "configure:5252: 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 @@ -5214,7 +5264,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_fortran_complex16=yes else @@ -5243,7 +5293,7 @@ EOF fi echo $ac_n "checking for Fortran COMPLEX*32""... $ac_c" 1>&6 -echo "configure:5247: checking for Fortran COMPLEX*32" >&5 +echo "configure:5297: 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 @@ -5259,7 +5309,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cctk_cv_have_fortran_complex32=yes else @@ -5290,12 +5340,12 @@ 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:5294: checking for crypt" >&5 +echo "configure:5344: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5372: \"$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 @@ -5336,7 +5386,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:5340: checking for crypt in library crypt" >&5 +echo "configure:5390: 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 @@ -5345,7 +5395,7 @@ else ac_save_LIBS="$LIBS" LIBS="crypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5410: \"$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 @@ -5397,12 +5447,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:5401: checking for $ac_func" >&5 +echo "configure:5451: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5479: \"$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 @@ -5447,7 +5497,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for finite in library m""... $ac_c" 1>&6 -echo "configure:5451: checking for finite in library m" >&5 +echo "configure:5501: 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 @@ -5456,7 +5506,7 @@ else ac_save_LIBS="$LIBS" LIBS="m $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5521: \"$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 @@ -5509,12 +5559,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:5513: checking for $ac_func" >&5 +echo "configure:5563: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5591: \"$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 @@ -5559,7 +5609,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for isnan in library m""... $ac_c" 1>&6 -echo "configure:5563: checking for isnan in library m" >&5 +echo "configure:5613: 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 @@ -5568,7 +5618,7 @@ else ac_save_LIBS="$LIBS" LIBS="m $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5633: \"$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 @@ -5621,12 +5671,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5625: checking for $ac_func" >&5 +echo "configure:5675: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5703: \"$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 @@ -5671,7 +5721,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for isinf in library m""... $ac_c" 1>&6 -echo "configure:5675: checking for isinf in library m" >&5 +echo "configure:5725: checking for isinf in library m" >&5 ac_lib_var=`echo m'_'isinf | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5680,7 +5730,7 @@ else ac_save_LIBS="$LIBS" LIBS="m $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5745: \"$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 @@ -5733,12 +5783,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:5737: checking for $ac_func" >&5 +echo "configure:5787: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5815: \"$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 @@ -5783,7 +5833,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for mkstemp in library c""... $ac_c" 1>&6 -echo "configure:5787: checking for mkstemp in library c" >&5 +echo "configure:5837: 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 @@ -5792,18 +5842,18 @@ else ac_save_LIBS="$LIBS" LIBS="c $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5857: \"$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 @@ -5842,19 +5892,19 @@ done echo $ac_n "checking for va_copy""... $ac_c" 1>&6 -echo "configure:5846: checking for va_copy" >&5 +echo "configure:5896: 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 < int main() { va_list src, dest; va_copy(dest, src); return 0 ; return 0; } EOF -if { (eval echo configure:5858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5908: \"$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 @@ -5893,7 +5943,7 @@ if test "$PTHREADS_MODE" = 'yes'; then if test -z "$PTHREAD_LIBS"; then PTHREAD_LIBS= echo $ac_n "checking for main in library c_r""... $ac_c" 1>&6 -echo "configure:5897: checking for main in library c_r" >&5 +echo "configure:5947: 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 @@ -5902,14 +5952,14 @@ else ac_save_LIBS="$LIBS" LIBS="c_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5963: \"$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 @@ -5930,7 +5980,7 @@ else fi echo $ac_n "checking for main in library pthread""... $ac_c" 1>&6 -echo "configure:5934: checking for main in library pthread" >&5 +echo "configure:5984: 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 @@ -5939,14 +5989,14 @@ else ac_save_LIBS="$LIBS" LIBS="pthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6000: \"$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 @@ -5965,7 +6015,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:5969: checking for main in library pthreads" >&5 +echo "configure:6019: 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 @@ -5974,14 +6024,14 @@ else ac_save_LIBS="$LIBS" LIBS="pthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6035: \"$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 @@ -6351,6 +6401,12 @@ LDFLAGS="$LDFLAGS $KNOWN_LDFLAGS" : ${F_DEPEND_OUT=' > $@'} + +: ${CU_DEPEND='$(NVCC) -M'} + +: ${CU_DEPEND_OUT=' > $@'} + + # How to generate F90 dependency info for modules : ${F_DEPEND_MODULES='$(CCTK_HOME)/lib/sbin/f_depend_modules.pl'} @@ -6369,6 +6425,8 @@ LDFLAGS="$LDFLAGS $KNOWN_LDFLAGS" : ${F90_POSTPROCESSING=''} +: ${NVCC_POSTPROCESSING=''} + # How to generate an intermediate C++ name (some compilers are very picky). : ${CXX_WORKING_NAME='$(notdir $<)'} @@ -6448,7 +6506,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:6452: checking for X" >&5 +echo "configure:6510: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -6510,12 +6568,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6577: \"$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* @@ -6584,14 +6642,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6653: \"$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. @@ -6836,6 +6894,7 @@ s%@RANLIB@%$RANLIB%g s%@CPP@%$CPP%g s%@FPPFLAGS@%$FPPFLAGS%g s%@FPP@%$FPP%g +s%@NVCC@%$NVCC%g s%@PERL@%$PERL%g s%@F90@%$F90%g s%@F77@%$F77%g @@ -6849,6 +6908,7 @@ 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%@NVCC_WARN_FLAGS@%$NVCC_WARN_FLAGS%g s%@DEBUG_MODE@%$DEBUG_MODE%g s%@CPP_DEBUG_FLAGS@%$CPP_DEBUG_FLAGS%g s%@FPP_DEBUG_FLAGS@%$FPP_DEBUG_FLAGS%g @@ -6856,6 +6916,7 @@ 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%@NVCC_DEBUG_FLAGS@%$NVCC_DEBUG_FLAGS%g s%@OPTIMISE_MODE@%$OPTIMISE_MODE%g s%@CPP_OPTIMISE_FLAGS@%$CPP_OPTIMISE_FLAGS%g s%@FPP_OPTIMISE_FLAGS@%$FPP_OPTIMISE_FLAGS%g @@ -6867,6 +6928,7 @@ s%@C_NO_OPTIMISE_FLAGS@%$C_NO_OPTIMISE_FLAGS%g s%@CXX_NO_OPTIMISE_FLAGS@%$CXX_NO_OPTIMISE_FLAGS%g s%@F77_NO_OPTIMISE_FLAGS@%$F77_NO_OPTIMISE_FLAGS%g s%@F90_NO_OPTIMISE_FLAGS@%$F90_NO_OPTIMISE_FLAGS%g +s%@NVCC_OPTIMISE_FLAGS@%$NVCC_OPTIMISE_FLAGS%g s%@PROFILE_MODE@%$PROFILE_MODE%g s%@CPP_PROFILE_FLAGS@%$CPP_PROFILE_FLAGS%g s%@FPP_PROFILE_FLAGS@%$FPP_PROFILE_FLAGS%g @@ -6874,6 +6936,7 @@ 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%@NVCC_PROFILE_FLAGS@%$NVCC_PROFILE_FLAGS%g s%@OPENMP_MODE@%$OPENMP_MODE%g s%@CPP_OPENMP_FLAGS@%$CPP_OPENMP_FLAGS%g s%@FPP_OPENMP_FLAGS@%$FPP_OPENMP_FLAGS%g @@ -6881,6 +6944,7 @@ s%@C_OPENMP_FLAGS@%$C_OPENMP_FLAGS%g s%@CXX_OPENMP_FLAGS@%$CXX_OPENMP_FLAGS%g s%@F77_OPENMP_FLAGS@%$F77_OPENMP_FLAGS%g s%@F90_OPENMP_FLAGS@%$F90_OPENMP_FLAGS%g +s%@NVCC_OPENMP_FLAGS@%$NVCC_OPENMP_FLAGS%g s%@LIBDIR_PREFIX@%$LIBDIR_PREFIX%g s%@RUNDIR_PREFIX@%$RUNDIR_PREFIX%g s%@LIBLINK_PREFIX@%$LIBLINK_PREFIX%g @@ -6889,12 +6953,14 @@ s%@USE_RANLIB@%$USE_RANLIB%g s%@RANLIBFLAGS@%$RANLIBFLAGS%g s%@F90FLAGS@%$F90FLAGS%g s%@F77FLAGS@%$F77FLAGS%g +s%@NVCCFLAGS@%$NVCCFLAGS%g s%@CPP_VERSION@%$CPP_VERSION%g s%@CC_VERSION@%$CC_VERSION%g s%@CXX_VERSION@%$CXX_VERSION%g s%@FPP_VERSION@%$FPP_VERSION%g s%@F77_VERSION@%$F77_VERSION%g s%@F90_VERSION@%$F90_VERSION%g +s%@NVCC_VERSION@%$NVCC_VERSION%g s%@BUILD_GETOPT@%$BUILD_GETOPT%g s%@BUILD_REGEX@%$BUILD_REGEX%g s%@LIBDIRS@%$LIBDIRS%g @@ -6926,6 +6992,8 @@ s%@F77_DEPEND@%$F77_DEPEND%g s%@F77_DEPEND_OUT@%$F77_DEPEND_OUT%g s%@F_DEPEND@%$F_DEPEND%g s%@F_DEPEND_OUT@%$F_DEPEND_OUT%g +s%@CU_DEPEND@%$CU_DEPEND%g +s%@CU_DEPEND_OUT@%$CU_DEPEND_OUT%g s%@F_DEPEND_MODULES@%$F_DEPEND_MODULES%g s%@F_DEPEND_MODULES_OUT@%$F_DEPEND_MODULES_OUT%g s%@C_POSTPROCESSING@%$C_POSTPROCESSING%g @@ -6933,6 +7001,7 @@ s%@CXX_POSTPROCESSING@%$CXX_POSTPROCESSING%g s%@F77_POSTPROCESSING@%$F77_POSTPROCESSING%g s%@F_POSTPROCESSING@%$F_POSTPROCESSING%g s%@F90_POSTPROCESSING@%$F90_POSTPROCESSING%g +s%@NVCC_POSTPROCESSING@%$NVCC_POSTPROCESSING%g s%@CXX_WORKING_NAME@%$CXX_WORKING_NAME%g s%@F90_SUFFIX@%$F90_SUFFIX%g s%@GET_WD@%$GET_WD%g diff --git a/lib/make/configure.in b/lib/make/configure.in index 0ff6d397..9b7966b0 100644 --- a/lib/make/configure.in +++ b/lib/make/configure.in @@ -13,6 +13,9 @@ AC_REVISION($Header$) dnl It looks like older versions of Autoconf don't quite work properly under dnl cygwin. +dnl Please use autoconf-2.13 to generate a configure script. Newer version of autoconf +dnl won't work. + AC_PREREQ(2.13) dnl Starts here @@ -190,6 +193,10 @@ if test -z "$FPP" ; then AC_PATH_PROGS(FPP, cpp, echo, /lib:/usr/lib:/usr/local/lib:$PATH) fi +if test -z "$NVCC" ; then + AC_CHECK_PROGS(NVCC, nvcc) +fi + if test -z "$PERL" ; then AC_CHECK_PROGS(PERL, perl) fi @@ -304,6 +311,9 @@ else : ${F90_WARN_FLAGS=''} fi +# nvcc itself doesn't have warning flags. warnings will be given by C compilers. +AC_SUBST(NVCC_WARN_FLAGS) + : ${NVCC_WARN_FLAGS=''} AC_SUBST(DEBUG_MODE) DEBUG_MODE='no' @@ -331,6 +341,8 @@ AC_SUBST(F77_DEBUG_FLAGS) AC_SUBST(F90_DEBUG_FLAGS) : ${F90_DEBUG_FLAGS='-g'} +AC_SUBST(NVCC_DEBUG_FLAGS) +: ${NVCC_DEBUG_FLAGS='-g'} # Set the optimization flags if they've not been set by now # (using '-O2' as a reasonable default) @@ -370,6 +382,8 @@ AC_SUBST(F77_NO_OPTIMISE_FLAGS) AC_SUBST(F90_NO_OPTIMISE_FLAGS) : ${F90_NO_OPTIMISE_FLAGS='-O0'} +AC_SUBST(NVCC_OPTIMISE_FLAGS) +: ${NVCC_OPTIMISE_FLAGS='-O2'} # Set the profiling flags if they've not been set by now # (using '-pg' as a reasonable default) @@ -393,6 +407,8 @@ AC_SUBST(F77_PROFILE_FLAGS) AC_SUBST(F90_PROFILE_FLAGS) : ${F90_PROFILE_FLAGS='-pg'} +AC_SUBST(NVCC_PROFILE_FLAGS) +: ${NVCC_PROFILE_FLAGS='-pg'} # Set the OpenMP flags if they've not been set by now AC_SUBST(OPENMP_MODE) @@ -403,6 +419,7 @@ AC_SUBST(C_OPENMP_FLAGS) AC_SUBST(CXX_OPENMP_FLAGS) AC_SUBST(F77_OPENMP_FLAGS) AC_SUBST(F90_OPENMP_FLAGS) +AC_SUBST(NVCC_OPENMP_FLAGS) ########################################################################## @@ -558,6 +575,7 @@ AC_SUBST(RANLIBFLAGS) AC_SUBST(F90FLAGS) AC_SUBST(F77FLAGS) +AC_SUBST(NVCCFLAGS) #: ${F90FLAGS="$CFLAGS"} #: ${F77FLAGS="$CFLAGS"} @@ -568,6 +586,7 @@ AC_SUBST(CXX_VERSION) AC_SUBST(FPP_VERSION) AC_SUBST(F77_VERSION) AC_SUBST(F90_VERSION) +AC_SUBST(NVCC_VERSION) dnl Checks for library functions. @@ -1170,6 +1189,12 @@ AC_SUBST(F_DEPEND) AC_SUBST(F_DEPEND_OUT) : ${F_DEPEND_OUT=' > $@'} +AC_SUBST(CU_DEPEND) +: ${CU_DEPEND='$(NVCC) -M'} +AC_SUBST(CU_DEPEND_OUT) +: ${CU_DEPEND_OUT=' > $@'} + + # How to generate F90 dependency info for modules AC_SUBST(F_DEPEND_MODULES) : ${F_DEPEND_MODULES='$(CCTK_HOME)/lib/sbin/f_depend_modules.pl'} @@ -1187,6 +1212,8 @@ AC_SUBST(F_POSTPROCESSING) : ${F_POSTPROCESSING=''} AC_SUBST(F90_POSTPROCESSING) : ${F90_POSTPROCESSING=''} +AC_SUBST(NVCC_POSTPROCESSING) +: ${NVCC_POSTPROCESSING=''} # How to generate an intermediate C++ name (some compilers are very picky). AC_SUBST(CXX_WORKING_NAME) diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in index 88a37c0b..b3b02abc 100644 --- a/lib/make/make.config.defn.in +++ b/lib/make/make.config.defn.in @@ -25,6 +25,7 @@ export CC = @CC@ export CXX = @CXX@ export F90 = @F90@ export F77 = @F77@ +export NVCC = @NVCC@ export CPP = @CPP@ export FPP = @FPP@ export LD = @LD@ @@ -36,6 +37,7 @@ export CFLAGS = @CFLAGS@ export CXXFLAGS = @CXXFLAGS@ export F90FLAGS = @F90FLAGS@ export F77FLAGS = @F77FLAGS@ +export NVCCFLAGS = @NVCCFLAGS@ export CPPFLAGS = @CPPFLAGS@ export FPPFLAGS = @FPPFLAGS@ @@ -49,6 +51,7 @@ export F_LINE_DIRECTIVES = @F_LINE_DIRECTIVES@ # FPP: @FPP_VERSION@ # F77: @F77_VERSION@ # F90: @F90_VERSION@ +# NVCC: @NVCC_VERSION@ export MKDIRFLAGS = @MKDIRFLAGS@ @@ -67,6 +70,7 @@ export C_DEBUG_FLAGS = @C_DEBUG_FLAGS@ export CXX_DEBUG_FLAGS = @CXX_DEBUG_FLAGS@ export F90_DEBUG_FLAGS = @F90_DEBUG_FLAGS@ export F77_DEBUG_FLAGS = @F77_DEBUG_FLAGS@ +export NVCC_DEBUG_FLAGS = @NVCC_DEBUG_FLAGS@ # Optimisation flags export CPP_OPTIMISE_FLAGS = @CPP_OPTIMISE_FLAGS@ @@ -75,12 +79,14 @@ export C_OPTIMISE_FLAGS = @C_OPTIMISE_FLAGS@ export CXX_OPTIMISE_FLAGS = @CXX_OPTIMISE_FLAGS@ export F90_OPTIMISE_FLAGS = @F90_OPTIMISE_FLAGS@ export F77_OPTIMISE_FLAGS = @F77_OPTIMISE_FLAGS@ +export NVCC_OPTIMISE_FLAGS = @NVCC_OPTIMISE_FLAGS@ # No-optimisation flags export C_NO_OPTIMISE_FLAGS = @C_NO_OPTIMISE_FLAGS@ export CXX_NO_OPTIMISE_FLAGS = @CXX_NO_OPTIMISE_FLAGS@ export F90_NO_OPTIMISE_FLAGS = @F90_NO_OPTIMISE_FLAGS@ export F77_NO_OPTIMISE_FLAGS = @F77_NO_OPTIMISE_FLAGS@ +export NVCC_NO_OPTIMISE_FLAGS = @NVCC_NO_OPTIMISE_FLAGS@ # Profiling flags export CPP_PROFILE_FLAGS = @CPP_PROFILE_FLAGS@ @@ -89,6 +95,7 @@ export C_PROFILE_FLAGS = @C_PROFILE_FLAGS@ export CXX_PROFILE_FLAGS = @CXX_PROFILE_FLAGS@ export F90_PROFILE_FLAGS = @F90_PROFILE_FLAGS@ export F77_PROFILE_FLAGS = @F77_PROFILE_FLAGS@ +export NVCC_PROFILE_FLAGS = @NVCC_PROFILE_FLAGS@ # OpenMP flags export CPP_OPENMP_FLAGS = @CPP_OPENMP_FLAGS@ @@ -97,6 +104,7 @@ export C_OPENMP_FLAGS = @C_OPENMP_FLAGS@ export CXX_OPENMP_FLAGS = @CXX_OPENMP_FLAGS@ export F90_OPENMP_FLAGS = @F90_OPENMP_FLAGS@ export F77_OPENMP_FLAGS = @F77_OPENMP_FLAGS@ +export NVCC_OPENMP_FLAGS = @NVCC_OPENMP_FLAGS@ # Warning flags export CPP_WARN_FLAGS = @CPP_WARN_FLAGS@ @@ -105,6 +113,7 @@ export C_WARN_FLAGS = @C_WARN_FLAGS@ export CXX_WARN_FLAGS = @CXX_WARN_FLAGS@ export F90_WARN_FLAGS = @F90_WARN_FLAGS@ export F77_WARN_FLAGS = @F77_WARN_FLAGS@ +export NVCC_WARN_FLAGS = @NVCC_WARN_FLAGS@ # Most compilers use -c -o to compile only, some do something different export CCOMPILEONLY = @CCOMPILEONLY@ @@ -133,12 +142,14 @@ export CXX_DEPEND = @CXX_DEPEND@ export F77_DEPEND = @F77_DEPEND@ export F_DEPEND = @F_DEPEND@ export F_DEPEND_MODULES = @F_DEPEND_MODULES@ +export CU_DEPEND = @CU_DEPEND@ export C_DEPEND_OUT = @C_DEPEND_OUT@ export CXX_DEPEND_OUT = @CXX_DEPEND_OUT@ export F77_DEPEND_OUT = @F77_DEPEND_OUT@ export F_DEPEND_OUT = @F_DEPEND_OUT@ export F_DEPEND_MODULES_OUT = @F_DEPEND_MODULES_OUT@ +export CU_DEPEND_OUT = @CU_DEPEND_OUT@ # Some compilers are very picky about the names of C++ files export CXX_WORKING_NAME = @CXX_WORKING_NAME@ @@ -152,6 +163,7 @@ export CXX_POSTPROCESSING = @CXX_POSTPROCESSING@ export F77_POSTPROCESSING = @F77_POSTPROCESSING@ export F_POSTPROCESSING = @F_POSTPROCESSING@ export F90_POSTPROCESSING = @F90_POSTPROCESSING@ +export NVCC_POSTPROCESSING = @NVCC_POSTPROCESSING@ # Do we need to use ranlib ? export USE_RANLIB = @USE_RANLIB@ @@ -222,6 +234,7 @@ ifeq ($(strip $(CCTK_DEBUG_MODE)),yes) CXXFLAGS += $(CXX_DEBUG_FLAGS) F77FLAGS += $(F77_DEBUG_FLAGS) F90FLAGS += $(F90_DEBUG_FLAGS) + NVCCFLAGS += $(NVCC_DEBUG_FLAGS) endif # Is this an optimising configuration ? @@ -234,11 +247,13 @@ ifeq ($(strip $(CCTK_OPTIMISE_MODE)),yes) CXXFLAGS += $(CXX_OPTIMISE_FLAGS) F77FLAGS += $(F77_OPTIMISE_FLAGS) F90FLAGS += $(F90_OPTIMISE_FLAGS) + NVCCFLAGS += $(NVCC_OPTIMISE_FLAGS) else CFLAGS += $(C_NO_OPTIMISE_FLAGS) CXXFLAGS += $(CXX_NO_OPTIMISE_FLAGS) F77FLAGS += $(F77_NO_OPTIMISE_FLAGS) F90FLAGS += $(F90_NO_OPTIMISE_FLAGS) + NVCCFLAGS += $(NVCC_NO_OPTIMISE_FLAGS) endif # Is this a profiling configuration ? @@ -251,6 +266,7 @@ ifeq ($(strip $(CCTK_PROFILE_MODE)),yes) CXXFLAGS += $(CXX_PROFILE_FLAGS) F77FLAGS += $(F77_PROFILE_FLAGS) F90FLAGS += $(F90_PROFILE_FLAGS) + NVCCFLAGS += $(NVCC_PROFILE_FLAGS) endif # Are we building with OpenMP support ? @@ -263,6 +279,7 @@ ifeq ($(strip $(CCTK_OPENMP_MODE)),yes) CXXFLAGS += $(CXX_OPENMP_FLAGS) F77FLAGS += $(F77_OPENMP_FLAGS) F90FLAGS += $(F90_OPENMP_FLAGS) + NVCCFLAGS += $(NVCC_OPENMP_FLAGS) endif # Are we building with all warnings switched on ? @@ -280,6 +297,7 @@ ifeq ($(strip $(CCTK_WARN_MODE)),yes) CXXFLAGS += $(CXX_WARN_FLAGS) F77FLAGS += $(F77_WARN_FLAGS) F90FLAGS += $(F90_WARN_FLAGS) + NVCCFLAGS += $(NVCC_WARN_FLAGS) endif # Stuff specific to an architecture. diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in index e656499d..e4f9ddf3 100644 --- a/lib/make/make.config.rules.in +++ b/lib/make/make.config.rules.in @@ -70,6 +70,11 @@ define F90_DEPENDENCIES current_wd=`$(GET_WD)` ; { if test $(F_LINE_DIRECTIVES) = 'yes'; then echo '#line 1 "'$<'"'; fi; cat $<; } | $(PERL) -p -e 's.//.CCTK_AUTOMATICALLY_GENERATED_CONCATENATION_PROTECTION.g' | $(FPP) $(FPPFLAGS) $(INCLUDE_LINE) $(EXTRA_DEFINES:%=-D%) -DFCODE -DF90CODE | $(PERL) -p -e 's.CCTK_AUTOMATICALLY_GENERATED_CONCATENATION_PROTECTION.//.g' | $(PERL) $(F_DEPEND_MODULES) $< $(basename $(notdir $<)).F90.o $(SRCDIR) $(USESTHORNS:%=$$current_wd/../%) $(F_DEPEND_MODULES_OUT) || { rm $@; exit 1; } endef +define CU_DEPENDENCIES + $(CU_DEPEND) $< $(INCLUDE_LINE) $(EXTRA_DEFINES:%=-D%) -DCCODE $(CU_DEPEND_OUT) + $(DEPENDENCY_FIXER) +endef + # No preprocessing, just create empty dependency file define f77_DEPENDENCIES echo "" > $@ @@ -87,6 +92,21 @@ define f90_DEPENDENCIES endef ##################################################################### +# Define how to do a CUDA compilation +# preporcess and postprocess are currently set the same as C. +define PREPROCESS_CU +{ if test $(C_LINE_DIRECTIVES) = 'yes'; then echo '#line 1 "'$<'"'; fi; cat $<; } | $(PERL) -s $(C_FILE_PROCESSOR) -line_directives=$(C_LINE_DIRECTIVES) -source_file_name=$< $(CONFIG) > $(notdir $<) +#{ if test $(C_LINE_DIRECTIVES) = 'yes'; then echo '#line 1 "'$<'"'; fi; cat $<; } | $(NVCC) -E $< $(INCLUDE_LINE) > $(notdir $<) +endef + +define COMPILE_CU +current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(NVCC) $(NVCCFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INCLUDE_LINE) $(EXTRA_DEFINES:%=-D%) -DCCODE +endef + +define POSTPROCESS_CU +$(CU_POSTPROCESSING) +endef + # Define how to do a C compilation define PREPROCESS_C { if test $(C_LINE_DIRECTIVES) = 'yes'; then echo '#line 1 "'$<'"'; fi; cat $<; } | $(PERL) -s $(C_FILE_PROCESSOR) -line_directives=$(C_LINE_DIRECTIVES) -source_file_name=$< $(CONFIG) > $(notdir $<) @@ -168,6 +188,19 @@ define PREPROCESS_f90 cat $< > $(basename $(notdir $<)).$(F90_SUFFIX) endef +# Build rules for CUDA + +%.cu.o: $(SRCDIR)/%.cu + @echo Preprocessing $< + $(PREPROCESS_CU) + @echo Compiling $< + $(COMPILE_CU) + @echo Postprocessing $< + $(POSTPROCESS_CU) + @echo $(DIVIDER) + +%.cu.d: $(SRCDIR)/%.cu + $(CU_DEPENDENCIES) # Build rules for C -- cgit v1.2.3