diff options
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/make/configure | 330 | ||||
-rw-r--r-- | lib/make/configure.in | 14 | ||||
-rwxr-xr-x | lib/make/configure.pl | 396 | ||||
-rw-r--r-- | lib/make/known-architectures/linux | 2 |
4 files changed, 401 insertions, 341 deletions
diff --git a/lib/make/configure b/lib/make/configure index 3be1b940..f1af1136 100755 --- a/lib/make/configure +++ b/lib/make/configure @@ -1278,8 +1278,12 @@ EOF # Deal with the Fortran compiler issues. # If there's a Fortran 90 compiler use that for all the Fortran. if test "x$F90" != "x" ; then - F77=$F90 - : {F77FLAGS=$F90FLAGS} ; + if test "x$F90" != "xnone" ; then + if test "x$F77" != "xnone" ; then + F77=$F90 + : {F77FLAGS=$F90FLAGS} ; + fi + fi fi # The known architecture stuff has probably set the LIBS variable @@ -1301,7 +1305,7 @@ unset LDFLAGS echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1305: checking how to run the C preprocessor" >&5 +echo "configure:1309: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1316,13 +1320,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1320 "configure" +#line 1324 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1330: \"$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 : @@ -1333,13 +1337,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1337 "configure" +#line 1341 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1347: \"$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 : @@ -1350,13 +1354,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1354 "configure" +#line 1358 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1364: \"$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 : @@ -1381,12 +1385,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1385: checking for ANSI C header files" >&5 +echo "configure:1389: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1390 "configure" +#line 1394 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1394,7 +1398,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1402: \"$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* @@ -1411,7 +1415,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1415 "configure" +#line 1419 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1429,7 +1433,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1433 "configure" +#line 1437 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1450,7 +1454,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1454 "configure" +#line 1458 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1461,7 +1465,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1488,14 +1492,14 @@ fi if test "x$cross_compiling" = "xno" ; then echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1492: checking whether byte ordering is bigendian" >&5 +echo "configure:1496: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 1499 "configure" +#line 1503 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1506,11 +1510,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 1514 "configure" +#line 1518 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1521,7 +1525,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1541,7 +1545,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1545 "configure" +#line 1549 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -1554,7 +1558,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1562: \"$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 @@ -1591,12 +1595,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1595: checking for working const" >&5 +echo "configure:1599: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1600 "configure" +#line 1604 "configure" #include "confdefs.h" int main() { @@ -1645,7 +1649,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1666,21 +1670,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1670: checking for inline" >&5 +echo "configure:1674: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 1677 "configure" +#line 1681 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1715,7 +1719,7 @@ if test "x$cross_compiling" = "xyes"; then fi echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:1719: checking size of long long" >&5 +echo "configure:1723: 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 @@ -1723,7 +1727,7 @@ else ac_cv_sizeof_long_long=$SIZEOF_LONG_LONG else cat > conftest.$ac_ext <<EOF -#line 1727 "configure" +#line 1731 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1734,7 +1738,7 @@ main() exit(0); } EOF -if { (eval echo configure:1738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1742: \"$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 @@ -1761,7 +1765,7 @@ if test "x$cross_compiling" = "xyes"; then fi echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:1765: checking size of long int" >&5 +echo "configure:1769: 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 @@ -1769,7 +1773,7 @@ else ac_cv_sizeof_long_int=$SIZEOF_LONG_INT else cat > conftest.$ac_ext <<EOF -#line 1773 "configure" +#line 1777 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1780,7 +1784,7 @@ main() exit(0); } EOF -if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1788: \"$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 @@ -1807,7 +1811,7 @@ if test "x$cross_compiling" = "xyes"; then fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1811: checking size of int" >&5 +echo "configure:1815: 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 @@ -1815,7 +1819,7 @@ else ac_cv_sizeof_int=$SIZEOF_INT else cat > conftest.$ac_ext <<EOF -#line 1819 "configure" +#line 1823 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1826,7 +1830,7 @@ main() exit(0); } EOF -if { (eval echo configure:1830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1834: \"$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 @@ -1853,7 +1857,7 @@ if test "x$cross_compiling" = "xyes"; then fi echo $ac_n "checking size of short int""... $ac_c" 1>&6 -echo "configure:1857: checking size of short int" >&5 +echo "configure:1861: 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 @@ -1861,7 +1865,7 @@ else ac_cv_sizeof_short_int=$SIZEOF_SHORT_INT else cat > conftest.$ac_ext <<EOF -#line 1865 "configure" +#line 1869 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1872,7 +1876,7 @@ main() exit(0); } EOF -if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1880: \"$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 @@ -1901,7 +1905,7 @@ if test "x$cross_compiling" = "xyes"; then fi echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:1905: checking size of long double" >&5 +echo "configure:1909: 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 @@ -1909,7 +1913,7 @@ else ac_cv_sizeof_long_double=$SIZEOF_LONG_DOUBLE else cat > conftest.$ac_ext <<EOF -#line 1913 "configure" +#line 1917 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1920,7 +1924,7 @@ main() exit(0); } EOF -if { (eval echo configure:1924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1928: \"$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 @@ -1947,7 +1951,7 @@ if test "x$cross_compiling" = "xyes"; then fi echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:1951: checking size of double" >&5 +echo "configure:1955: 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 @@ -1955,7 +1959,7 @@ else ac_cv_sizeof_double=$SIZEOF_DOUBLE else cat > conftest.$ac_ext <<EOF -#line 1959 "configure" +#line 1963 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1966,7 +1970,7 @@ main() exit(0); } EOF -if { (eval echo configure:1970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1974: \"$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 @@ -1994,7 +1998,7 @@ if test "x$cross_compiling" = "xyes"; then fi echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:1998: checking size of float" >&5 +echo "configure:2002: 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 @@ -2002,7 +2006,7 @@ else ac_cv_sizeof_float=$SIZEOF_FLOAT else cat > conftest.$ac_ext <<EOF -#line 2006 "configure" +#line 2010 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2013,7 +2017,7 @@ main() exit(0); } EOF -if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2021: \"$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 @@ -2042,7 +2046,7 @@ if test "x$cross_compiling" = "xyes"; then fi echo $ac_n "checking size of char *""... $ac_c" 1>&6 -echo "configure:2046: checking size of char *" >&5 +echo "configure:2050: 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 @@ -2050,7 +2054,7 @@ else ac_cv_sizeof_char_p=$SIZEOF_POINTER else cat > conftest.$ac_ext <<EOF -#line 2054 "configure" +#line 2058 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2061,7 +2065,7 @@ main() exit(0); } EOF -if { (eval echo configure:2065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2069: \"$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 @@ -2093,7 +2097,7 @@ if test "x$cross_compiling" = "xyes"; then eval "cctk_cv_nulldevice=$NULL_DEVICE" else echo $ac_n "checking for the null device""... $ac_c" 1>&6 -echo "configure:2097: checking for the null device" >&5 +echo "configure:2101: 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 @@ -2130,7 +2134,7 @@ fi # 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:2134: checking for X" >&5 +echo "configure:2138: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -2192,12 +2196,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 2196 "configure" +#line 2200 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2205: \"$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* @@ -2266,14 +2270,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 2270 "configure" +#line 2274 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:2277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2281: \"$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. @@ -2384,12 +2388,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in mkdir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2388: checking for $ac_func" >&5 +echo "configure:2392: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2393 "configure" +#line 2397 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2412,7 +2416,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2420: \"$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 @@ -2444,12 +2448,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in scandir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2448: checking for $ac_func" >&5 +echo "configure:2452: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2453 "configure" +#line 2457 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2472,7 +2476,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2480: \"$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 @@ -2496,7 +2500,7 @@ else SAVED_LIBDIRS="$LIBDIRS" LIBDIRS="$LIBDIRS /usr/ucblib" echo $ac_n "checking for scandir in library ucb""... $ac_c" 1>&6 -echo "configure:2500: checking for scandir in library ucb" >&5 +echo "configure:2504: checking for scandir in library ucb" >&5 ac_lib_var=`echo ucb'_'scandir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2505,7 +2509,7 @@ else ac_save_LIBS="$LIBS" LIBS="ucb $LIBS" cat > conftest.$ac_ext <<EOF -#line 2509 "configure" +#line 2513 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2516,7 +2520,7 @@ int main() { scandir() ; return 0; } EOF -if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2524: \"$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 @@ -2553,12 +2557,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2557: checking for $ac_func" >&5 +echo "configure:2561: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2562 "configure" +#line 2566 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2581,7 +2585,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2589: \"$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 @@ -2603,7 +2607,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in library nsl""... $ac_c" 1>&6 -echo "configure:2607: checking for gethostbyname in library nsl" >&5 +echo "configure:2611: 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 @@ -2612,7 +2616,7 @@ else ac_save_LIBS="$LIBS" LIBS="nsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2616 "configure" +#line 2620 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2623,7 +2627,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:2627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2631: \"$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 @@ -2654,12 +2658,12 @@ done # Check if we have mode_t available echo $ac_n "checking if mode_t is defined""... $ac_c" 1>&6 -echo "configure:2658: checking if mode_t is defined" >&5 +echo "configure:2662: checking if mode_t is defined" >&5 if eval "test \"`echo '$''{'cctk_cv_have_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2663 "configure" +#line 2667 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -2669,7 +2673,7 @@ int main() { mode_t foo; return 0 ; return 0; } EOF -if { (eval echo configure:2673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have_mode_t=yes" else @@ -2695,12 +2699,12 @@ fi echo $ac_n "checking for availability of gettimeofday timing""... $ac_c" 1>&6 -echo "configure:2699: checking for availability of gettimeofday timing" >&5 +echo "configure:2703: checking for availability of gettimeofday timing" >&5 if eval "test \"`echo '$''{'cctk_cv_time_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2704 "configure" +#line 2708 "configure" #include "confdefs.h" int main() { @@ -2708,7 +2712,7 @@ gettimeofday(); return 0; ; return 0; } EOF -if { (eval echo configure:2712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2716: \"$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 @@ -2730,12 +2734,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:2734: checking if gettimeofday needs timezone" >&5 +echo "configure:2738: checking if gettimeofday needs timezone" >&5 if eval "test \"`echo '$''{'cctk_cv_time_gettimeofday_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2739 "configure" +#line 2743 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/time.h> @@ -2748,7 +2752,7 @@ struct timeval tp; return 0; ; return 0; } EOF -if { (eval echo configure:2752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2756: \"$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 @@ -2771,12 +2775,12 @@ fi fi echo $ac_n "checking for availability of getrusage timing""... $ac_c" 1>&6 -echo "configure:2775: checking for availability of getrusage timing" >&5 +echo "configure:2779: checking for availability of getrusage timing" >&5 if eval "test \"`echo '$''{'cctk_cv_time_getrusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2780 "configure" +#line 2784 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/time.h> @@ -2789,7 +2793,7 @@ struct rusage ru; return 0; ; return 0; } EOF -if { (eval echo configure:2793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2797: \"$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 @@ -2811,12 +2815,12 @@ else fi echo $ac_n "checking for availability of _ftime timing""... $ac_c" 1>&6 -echo "configure:2815: checking for availability of _ftime timing" >&5 +echo "configure:2819: checking for availability of _ftime timing" >&5 if eval "test \"`echo '$''{'cctk_cv_time_ftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2820 "configure" +#line 2824 "configure" #include "confdefs.h" #include <stdio.h> #include <time.h> @@ -2829,7 +2833,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:2833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2837: \"$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 @@ -2856,12 +2860,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:2860: checking for $cctk_hdr" >&5 +echo "configure:2864: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2865 "configure" +#line 2869 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2869,7 +2873,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2896,12 +2900,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:2900: checking for $cctk_hdr" >&5 +echo "configure:2904: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2905 "configure" +#line 2909 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2909,7 +2913,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2936,12 +2940,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:2940: checking for $cctk_hdr" >&5 +echo "configure:2944: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2945 "configure" +#line 2949 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2949,7 +2953,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -2976,12 +2980,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:2980: checking for $cctk_hdr" >&5 +echo "configure:2984: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2985 "configure" +#line 2989 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -2989,7 +2993,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3016,12 +3020,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:3020: checking for $cctk_hdr" >&5 +echo "configure:3024: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3025 "configure" +#line 3029 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -3029,7 +3033,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3056,12 +3060,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:3060: checking for $cctk_hdr" >&5 +echo "configure:3064: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3065 "configure" +#line 3069 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -3069,7 +3073,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3096,12 +3100,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:3100: checking for $cctk_hdr" >&5 +echo "configure:3104: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3105 "configure" +#line 3109 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -3109,7 +3113,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3136,12 +3140,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:3140: checking for $cctk_hdr" >&5 +echo "configure:3144: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3145 "configure" +#line 3149 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -3149,7 +3153,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3173,12 +3177,12 @@ fi done echo $ac_n "checking for regex.h""... $ac_c" 1>&6 -echo "configure:3177: checking for regex.h" >&5 +echo "configure:3181: checking for regex.h" >&5 if eval "test \"`echo '$''{'cctk_cv_header_regex_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3182 "configure" +#line 3186 "configure" #include "confdefs.h" #include <stdio.h> #include <regex.h> @@ -3186,7 +3190,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:3190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_regex_h=yes" else @@ -3211,12 +3215,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:3215: checking for $cctk_hdr" >&5 +echo "configure:3219: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3220 "configure" +#line 3224 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -3226,7 +3230,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3253,12 +3257,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:3257: checking for $cctk_hdr" >&5 +echo "configure:3261: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3262 "configure" +#line 3266 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -3268,7 +3272,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3295,12 +3299,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:3299: checking for $cctk_hdr" >&5 +echo "configure:3303: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3304 "configure" +#line 3308 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -3310,7 +3314,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3337,12 +3341,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:3341: checking for $cctk_hdr" >&5 +echo "configure:3345: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3346 "configure" +#line 3350 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -3352,7 +3356,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3379,12 +3383,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:3383: checking for $cctk_hdr" >&5 +echo "configure:3387: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3388 "configure" +#line 3392 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -3392,7 +3396,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3419,12 +3423,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:3423: checking for $cctk_hdr" >&5 +echo "configure:3427: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3428 "configure" +#line 3432 "configure" #include "confdefs.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -3434,7 +3438,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3459,12 +3463,12 @@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3463: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3467: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3468 "configure" +#line 3472 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -3473,7 +3477,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3498,12 +3502,12 @@ fi # Check if we have socklen_t available echo $ac_n "checking if socklen_t is defined""... $ac_c" 1>&6 -echo "configure:3502: checking if socklen_t is defined" >&5 +echo "configure:3506: checking if socklen_t is defined" >&5 if eval "test \"`echo '$''{'cctk_cv_have_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3507 "configure" +#line 3511 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -3523,7 +3527,7 @@ int main() { socklen_t foo; return 0 ; return 0; } EOF -if { (eval echo configure:3527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have_socklen_t=yes" else @@ -3548,12 +3552,12 @@ fi # Check if someone has defined SOCKET echo $ac_n "checking if SOCKET is defined""... $ac_c" 1>&6 -echo "configure:3552: checking if SOCKET is defined" >&5 +echo "configure:3556: checking if SOCKET is defined" >&5 if eval "test \"`echo '$''{'cctk_cv_have_SOCKET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3557 "configure" +#line 3561 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -3573,7 +3577,7 @@ int main() { SOCKET foo; return 0 ; return 0; } EOF -if { (eval echo configure:3577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have_SOCKET=yes" else @@ -3598,19 +3602,19 @@ fi # Check if we have __int64 echo $ac_n "checking if __int64 is defined""... $ac_c" 1>&6 -echo "configure:3602: checking if __int64 is defined" >&5 +echo "configure:3606: checking if __int64 is defined" >&5 if eval "test \"`echo '$''{'cctk_cv_have___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3607 "configure" +#line 3611 "configure" #include "confdefs.h" int main() { __int64 foo; return 0 ; return 0; } EOF -if { (eval echo configure:3614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_have___int64=yes" else @@ -3645,12 +3649,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:3649: checking for $cctk_hdr" >&5 +echo "configure:3653: checking for $cctk_hdr" >&5 if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3654 "configure" +#line 3658 "configure" #include "confdefs.h" #include <$cctk_hdr> @@ -3658,7 +3662,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "cctk_cv_header_$cctk_safe=yes" else @@ -3698,14 +3702,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 3702 "configure" +#line 3706 "configure" #include "confdefs.h" int main() { bool foo; ; return 0; } EOF -if { (eval echo configure:3709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_BOOL 1 @@ -3731,12 +3735,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:3735: checking for $ac_func" >&5 +echo "configure:3739: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3740 "configure" +#line 3744 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3759,7 +3763,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3767: \"$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 @@ -3804,12 +3808,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:3808: checking for crypt" >&5 +echo "configure:3812: checking for crypt" >&5 if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3813 "configure" +#line 3817 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char crypt(); below. */ @@ -3832,7 +3836,7 @@ crypt(); ; return 0; } EOF -if { (eval echo configure:3836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3840: \"$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 @@ -3850,7 +3854,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:3854: checking for crypt in library crypt" >&5 +echo "configure:3858: 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 @@ -3859,7 +3863,7 @@ else ac_save_LIBS="$LIBS" LIBS="crypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 3863 "configure" +#line 3867 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3870,7 +3874,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3878: \"$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 @@ -4514,11 +4518,11 @@ EOF # Set default Fortran compilers if test -z "$F90" ; then - F90="F90_NOT_SET" + F90="none" fi if test -z "$F77" ; then - F77="F77_NOT_SET" + F77="none" fi trap '' 1 2 15 @@ -4932,7 +4936,7 @@ fi; done EOF cat >> $CONFIG_STATUS <<EOF -$PERL -s $PERL_CONFIGURE_SCRIPT -compiler="$F77" -opts="$F77FLAGS" . +$PERL -s $PERL_CONFIGURE_SCRIPT -compiler_f77="$F77" -opts_f77="$F77FLAGS" -compiler_f90="$F90" -opts_f90="$F90FLAGS" . EOF cat >> $CONFIG_STATUS <<\EOF diff --git a/lib/make/configure.in b/lib/make/configure.in index 7e198539..7e5a90d1 100644 --- a/lib/make/configure.in +++ b/lib/make/configure.in @@ -206,8 +206,12 @@ EOF # Deal with the Fortran compiler issues. # If there's a Fortran 90 compiler use that for all the Fortran. if test "x$F90" != "x" ; then - F77=$F90 - : {F77FLAGS=$F90FLAGS} ; + if test "x$F90" != "xnone" ; then + if test "x$F77" != "xnone" ; then + F77=$F90 + : {F77FLAGS=$F90FLAGS} ; + fi + fi fi # The known architecture stuff has probably set the LIBS variable @@ -1080,16 +1084,16 @@ AC_DEFINE_UNQUOTED(CCTK_L2_CACHE_SIZE, $L2_CACHE_SIZE) dnl Run any other scripts necessary -AC_OUTPUT_COMMANDS(,$PERL -s $PERL_CONFIGURE_SCRIPT -compiler="$F77" -opts="$F77FLAGS" .) +AC_OUTPUT_COMMANDS(,$PERL -s $PERL_CONFIGURE_SCRIPT -compiler_f77="$F77" -opts_f77="$F77FLAGS" -compiler_f90="$F90" -opts_f90="$F90FLAGS" .) # Set default Fortran compilers AC_SUBST(F90) if test -z "$F90" ; then - F90="F90_NOT_SET" + F90="none" fi AC_SUBST(F77) if test -z "$F77" ; then - F77="F77_NOT_SET" + F77="none" fi dnl Output everything diff --git a/lib/make/configure.pl b/lib/make/configure.pl index 68ad9555..0be47791 100755 --- a/lib/make/configure.pl +++ b/lib/make/configure.pl @@ -31,97 +31,26 @@ foreach $line (@routines) sub test_fortran_name { local($data); + local($use_f77,$use_f90); local($retcode, $line, $name, $case, $n_underscores); local($underscore_suffix, $normal_suffix, $case_prefix); - if($compiler && $compiler ne "" && $compiler !~ /NOT_SET/) - { - # Create a test file - open(OUT, ">fname_test.f") || die "Cannot open fname_test.f\n"; - - print OUT <<EOT; - subroutine test(a) - integer a - a = 1 - call test_name(a) - return - end - -EOT - - close OUT; - - # Compile the test file - print "Compiling test file with $compiler $opts...\n"; - system("$compiler $opts -c fname_test.f"); - - $retcode = $? >> 8; - - if($retcode > 0) - { - print "Failed to compile fname_test.f\n"; - } - - - # Search the object file for the appropriate symbols - open(IN, "<fname_test.o") || open(IN, "<fname_test.obj") || die "Cannot open fname_test.o\n"; - - while(<IN>) - { - $line = $_; - if($line =~ m:(TEST_NAME)(_*):i) - { - $name = $1; - $underscores = $2; - - # Extremely quick hack to sort out problems later on with common block - # names. - - if($_ =~ m:_TEST_NAME:i) - { - $symbols_preceeded_by_underscores=1; - } - else - { - $symbols_preceeded_by_underscores=0; - } - - # Find out suffices. - if($name =~ m:TEST_NAME:) - { - print "Uppercase - "; - $case = 1; - } - if($name =~ m:test_name:) - { - print "Lowercase - "; - $case = 0; - } - if($underscores eq "") - { - print " No trailing underscore\n"; - $n_underscores = 0; - } - if($underscores eq "_") - { - print "One trailing underscore\n"; - $n_underscores = 1; - } - if($underscores eq "__") - { - print "Two trailing underscores\n"; - $n_underscores = 2; - } - - last; - } - } - - close IN; - - # Delete the temporary files - unlink <fname_test.*>; + $use_f77 = 0; + $use_f90 = 0; + if($compiler_f77 && $compiler_f77 ne "" && $compiler_f77 !~ /none/) + { + ($case, $n_underscores) = &compile_fortran_common_name($compiler_f77,$opts_f77); + $use_f77 = 1; + } + elsif ($compiler_f90 && $compiler_f90 ne "" && $compiler_f90 !~ /none/) + { + ($case, $n_underscores) = &compile_fortran_common_name($compiler_f90,$opts_f90); + $use_f90 = 1; + } + + if($use_f90 || $use_f77) + { # Determine the case and number of underscores ($underscore_suffix, $normal_suffix, $case_prefix) = &determine_transformation($n_underscores, $case); @@ -173,93 +102,22 @@ sub test_fortran_common_name local($retcode, $line, $name, $case, $n_underscores); local($underscore_suffix, $normal_suffix, $case_prefix); - if($compiler && $compiler ne "" && $compiler !~ /NOT_SET/) - { - # Create a test file - open(OUT, ">fname_test.f") || die "Cannot open fname_test.f\n"; - - print OUT <<EOT; - subroutine test_name - real b - common /test_common/b - b = 2.0 - return - end - -EOT - - close OUT; - - # Compile the test file - print "Compiling test file with $compiler $opts...\n"; - system("$compiler $opts -c fname_test.f"); - - $retcode = $? >> 8; - - if($retcode > 0) - { - print "Failed to compile fname_test.f\n"; - } - - - # Search the object file for the appropriate symbols - open(IN, "<fname_test.o") || open(IN, "<fname_test.obj") || die "Cannot open fname_test.o\n"; - - while(<IN>) - { - $line = $_; - if($line =~ m:(_[\w_]*)?(TEST_COMMON)(_*):i) - { - $prefix = $1; - $name = $2; - $underscores = $3; - - # This is a pain. If all symbols have underscores, need to remove - # the first one here. - - if($symbols_preceeded_by_underscores) - { - if($prefix =~ m:^_(.*):) - { - $prefix = $1; - } - } - - if($name =~ m:TEST_COMMON:) - { - print "Uppercase - "; - $case = 1; - } - if($name =~ m:test_common:) - { - print "Lowercase - "; - $case = 0; - } - if($underscores eq "") - { - print " No trailing underscore\n"; - $n_underscores = 0; - } - if($underscores eq "_") - { - print "One trailing underscore\n"; - $n_underscores = 1; - } - if($underscores eq "__") - { - print "Two trailing underscores\n"; - $n_underscores = 2; - } - - last; - } - } - - close IN; - - # Delete the temporary files - unlink <fname_test.*>; + $use_f77 = 0; + $use_f90 = 0; + if($compiler_f77 && $compiler_f77 ne "" && $compiler_f77 !~ /none/) + { + ($case, $n_underscores) = &compile_fortran_common_name($compiler_f77,$opts_f77); + $use_f77 = 1; + } + elsif ($compiler_f90 && $compiler_f90 ne "" && $compiler_f90 !~ /none/) + { + ($case, $n_underscores) = &compile_fortran_common_name($compiler_f90,$opts_f90); + $use_f90 = 1; + } + + if($use_f90 || $use_f77) + { # Determine the case and number of underscores ($underscore_suffix, $normal_suffix, $case_prefix) = &determine_transformation($n_underscores, $case); @@ -336,3 +194,195 @@ sub determine_transformation return ($underscore_suffix, $normal_suffix, $case_prefix); } + + +sub compile_fortran_common_name +{ + local($compiler,$opts) = @_; + local($data); + local($retcode, $line, $name, $case, $n_underscores); + local($underscore_suffix, $normal_suffix, $case_prefix); + + # Create a test file + open(OUT, ">fname_test.f") || die "Cannot open fname_test.f\n"; + + print OUT <<EOT; + subroutine test_name + real b + common /test_common/b + b = 2.0 + return + end + +EOT + + close OUT; + + # Compile the test file + print "Compiling test file with $compiler $opts ...\n"; + system("$compiler $opts -c fname_test.f"); + + $retcode = $? >> 8; + + if($retcode > 0) + { + print "Failed to compile fname_test.f\n"; + } + + + # Search the object file for the appropriate symbols + open(IN, "<fname_test.o") || open(IN, "<fname_test.obj") || die "Cannot open fname_test.o\n"; + + while(<IN>) + { + $line = $_; + if($line =~ m:(_[\w_]*)?(TEST_COMMON)(_*):i) + { + $prefix = $1; + $name = $2; + $underscores = $3; + + # This is a pain. If all symbols have underscores, need to remove + # the first one here. + + if($symbols_preceeded_by_underscores) + { + if($prefix =~ m:^_(.*):) + { + $prefix = $1; + } + } + + if($name =~ m:TEST_COMMON:) + { + print "Uppercase - "; + $case = 1; + } + if($name =~ m:test_common:) + { + print "Lowercase - "; + $case = 0; + } + if($underscores eq "") + { + print " No trailing underscore\n"; + $n_underscores = 0; + } + if($underscores eq "_") + { + print "One trailing underscore\n"; + $n_underscores = 1; + } + if($underscores eq "__") + { + print "Two trailing underscores\n"; + $n_underscores = 2; + } + + last; + } + } + + close IN; + + # Delete the temporary files + unlink <fname_test.*>; + + return ($case,$n_underscores); +} + + +sub compile_fortran_name +{ + local($compiler,$opts) = @_; + local($data); + local($retcode, $line, $name, $case, $n_underscores); + local($underscore_suffix, $normal_suffix, $case_prefix); + + # Create a test file + open(OUT, ">fname_test.f") || die "Cannot open fname_test.f\n"; + + print OUT <<EOT; + subroutine test(a) + integer a + a = 1 + call test_name(a) + return + end + +EOT + + close OUT; + + # Compile the test file + print "Compiling test file with $compiler_f77 $opts_f77 ...\n"; + system("$compiler_f77 $opts_f77 -c fname_test.f"); + + $retcode = $? >> 8; + + if($retcode > 0) + { + print "Failed to compile fname_test.f\n"; + } + + + # Search the object file for the appropriate symbols + open(IN, "<fname_test.o") || open(IN, "<fname_test.obj") || die "Cannot open fname_test.o\n"; + + while(<IN>) + { + $line = $_; + if($line =~ m:(TEST_NAME)(_*):i) + { + $name = $1; + $underscores = $2; + + # Extremely quick hack to sort out problems later on with common block + # names. + + if($_ =~ m:_TEST_NAME:i) + { + $symbols_preceeded_by_underscores=1; + } + else + { + $symbols_preceeded_by_underscores=0; + } + + # Find out suffices. + if($name =~ m:TEST_NAME:) + { + print "Uppercase - "; + $case = 1; + } + if($name =~ m:test_name:) + { + print "Lowercase - "; + $case = 0; + } + if($underscores eq "") + { + print " No trailing underscore\n"; + $n_underscores = 0; + } + if($underscores eq "_") + { + print "One trailing underscore\n"; + $n_underscores = 1; + } + if($underscores eq "__") + { + print "Two trailing underscores\n"; + $n_underscores = 2; + } + + last; + } + } + + close IN; + + # Delete the temporary files + unlink <fname_test.*>; + +} diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux index 05b29ddd..4cb63f45 100644 --- a/lib/make/known-architectures/linux +++ b/lib/make/known-architectures/linux @@ -37,6 +37,8 @@ else LINUX_F90_COMP=SGI elif test "`$F90 -V 2>&1 | grep -i intel`" ; then LINUX_F90_COMP=Intel + elif test "$F90" = "none" ; then + LINUX_F90_COMP=none else echo Unknown Linux f90 compiler. echo Please add appropriate information to |