diff options
author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-10-11 13:49:09 +0000 |
---|---|---|
committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-10-11 13:49:09 +0000 |
commit | 1545df229338ec2213b008e9589084cf726fefb3 (patch) | |
tree | 5d2f815ba54037c027d053efbd1f47aa9c3d4dc6 | |
parent | e868eb73536f5be9f664cb75169e7361457e5d26 (diff) |
Added a "preferred-compilers" section to the known-architecture stuff.
Added detection of NULL device, 'though not added a symbol for it yet.
Fixed a bug in the dependencies for AIX.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1013 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rwxr-xr-x | lib/make/configure | 195 | ||||
-rw-r--r-- | lib/make/configure.in | 38 | ||||
-rw-r--r-- | lib/make/known-architectures/aix | 37 | ||||
-rw-r--r-- | lib/make/known-architectures/cygwin | 65 | ||||
-rw-r--r-- | lib/make/known-architectures/hp-ux | 21 | ||||
-rw-r--r-- | lib/make/known-architectures/irix | 140 | ||||
-rw-r--r-- | lib/make/known-architectures/linux | 78 | ||||
-rw-r--r-- | lib/make/known-architectures/osf | 11 | ||||
-rw-r--r-- | lib/make/known-architectures/unicos | 25 |
9 files changed, 377 insertions, 233 deletions
diff --git a/lib/make/configure b/lib/make/configure index c62f40ed..99352e07 100755 --- a/lib/make/configure +++ b/lib/make/configure @@ -636,8 +636,16 @@ test "$host_alias" != "$target_alias" && program_prefix=${target_alias}- +# See if there are any preferred compilers for this system + +CCTK_CONFIG_STAGE="preferred-compilers" + +if test -r $srcdir/known-architectures/$host_os ; then +. $srcdir/known-architectures/$host_os +fi + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:641: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:649: 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 @@ -664,11 +672,11 @@ else fi -if test -z "$CC" ; then +#if test -z "$CC" ; then # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:672: checking for $ac_word" >&5 +echo "configure:680: 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 @@ -698,7 +706,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:702: checking for $ac_word" >&5 +echo "configure:710: 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 @@ -749,7 +757,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:753: checking for $ac_word" >&5 +echo "configure:761: 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 @@ -781,7 +789,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:785: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:793: 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. @@ -792,12 +800,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 796 "configure" +#line 804 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -823,12 +831,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:827: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:835: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:832: checking whether we are using GNU C" >&5 +echo "configure:840: 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 @@ -837,7 +845,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:841: \"$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:849: \"$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 @@ -856,7 +864,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:860: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:868: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -887,15 +895,15 @@ else fi fi -fi +#fi -if test -z "$CXX" ; then +#if test -z "$CXX" ; then for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl 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:899: checking for $ac_word" >&5 +echo "configure:907: 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 @@ -927,7 +935,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:931: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:939: 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. @@ -938,12 +946,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 942 "configure" +#line 950 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -969,12 +977,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:973: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:981: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:978: checking whether we are using GNU C++" >&5 +echo "configure:986: 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 @@ -983,7 +991,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:987: \"$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:995: \"$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 @@ -1002,7 +1010,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1006: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1014: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1033,13 +1041,13 @@ else fi fi -fi +#fi 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:1043: checking for $ac_word" >&5 +echo "configure:1051: 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 @@ -1075,7 +1083,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:1079: checking for $ac_word" >&5 +echo "configure:1087: 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 @@ -1119,7 +1127,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:1123: checking for $ac_word" >&5 +echo "configure:1131: 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 @@ -1156,7 +1164,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:1160: checking for $ac_word" >&5 +echo "configure:1168: 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 @@ -1193,7 +1201,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:1197: checking for $ac_word" >&5 +echo "configure:1205: 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 @@ -1230,7 +1238,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:1234: checking for $ac_word" >&5 +echo "configure:1242: 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 @@ -1267,7 +1275,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:1271: checking for $ac_word" >&5 +echo "configure:1279: 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 @@ -1304,7 +1312,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:1308: checking for $ac_word" >&5 +echo "configure:1316: 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 @@ -1358,6 +1366,8 @@ cat > cctk_archdefs.h <<EOF #define _CCTK_ARCHDEFS_H_ EOF +CCTK_CONFIG_STAGE="misc" + if test -r $srcdir/known-architectures/$host_os ; then . $srcdir/known-architectures/$host_os fi @@ -1429,7 +1439,7 @@ LDFLAGS= echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1433: checking how to run the C preprocessor" >&5 +echo "configure:1443: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1444,13 +1454,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 1448 "configure" +#line 1458 "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:1454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1464: \"$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 : @@ -1461,13 +1471,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1465 "configure" +#line 1475 "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:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1481: \"$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 : @@ -1478,13 +1488,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1482 "configure" +#line 1492 "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:1488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1498: \"$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 : @@ -1509,12 +1519,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1513: checking for ANSI C header files" >&5 +echo "configure:1523: 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 1518 "configure" +#line 1528 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1522,7 +1532,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1536: \"$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* @@ -1539,7 +1549,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 1543 "configure" +#line 1553 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1557,7 +1567,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 1561 "configure" +#line 1571 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1578,7 +1588,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1582 "configure" +#line 1592 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1589,7 +1599,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1615,14 +1625,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1619: checking whether byte ordering is bigendian" >&5 +echo "configure:1629: 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 1626 "configure" +#line 1636 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1633,11 +1643,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1647: \"$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 1641 "configure" +#line 1651 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1648,7 +1658,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1668,7 +1678,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 1672 "configure" +#line 1682 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -1681,7 +1691,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1695: \"$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 @@ -1705,12 +1715,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1709: checking for working const" >&5 +echo "configure:1719: 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 1714 "configure" +#line 1724 "configure" #include "confdefs.h" int main() { @@ -1759,7 +1769,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1780,21 +1790,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1784: checking for inline" >&5 +echo "configure:1794: 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 1791 "configure" +#line 1801 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1820,7 +1830,7 @@ EOF esac echo $ac_n "checking for long double""... $ac_c" 1>&6 -echo "configure:1824: checking for long double" >&5 +echo "configure:1834: checking for long double" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1831,7 +1841,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 1835 "configure" +#line 1845 "configure" #include "confdefs.h" int main() { /* The Stardent Vistra knows sizeof(long double), but does not support it. */ @@ -1839,7 +1849,7 @@ long double foo = 0.0; /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ exit(sizeof(long double) < sizeof(double)); } EOF -if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_long_double=yes else @@ -1865,7 +1875,7 @@ fi # Check for sizes of integer types echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:1869: checking size of long int" >&5 +echo "configure:1879: 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 @@ -1873,7 +1883,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1877 "configure" +#line 1887 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1884,7 +1894,7 @@ main() exit(0); } EOF -if { (eval echo configure:1888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1898: \"$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 @@ -1904,7 +1914,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1908: checking size of int" >&5 +echo "configure:1918: 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 @@ -1912,7 +1922,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1916 "configure" +#line 1926 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1923,7 +1933,7 @@ main() exit(0); } EOF -if { (eval echo configure:1927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1937: \"$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 @@ -1943,7 +1953,7 @@ EOF echo $ac_n "checking size of short int""... $ac_c" 1>&6 -echo "configure:1947: checking size of short int" >&5 +echo "configure:1957: 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 @@ -1951,7 +1961,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1955 "configure" +#line 1965 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1962,7 +1972,7 @@ main() exit(0); } EOF -if { (eval echo configure:1966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1976: \"$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 @@ -1984,7 +1994,7 @@ EOF # Check for sizes of floating point types echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:1988: checking size of long double" >&5 +echo "configure:1998: 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 @@ -1992,7 +2002,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1996 "configure" +#line 2006 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2003,7 +2013,7 @@ main() exit(0); } EOF -if { (eval echo configure:2007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2017: \"$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 @@ -2023,7 +2033,7 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:2027: checking size of double" >&5 +echo "configure:2037: 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 @@ -2031,7 +2041,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2035 "configure" +#line 2045 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2042,7 +2052,7 @@ main() exit(0); } EOF -if { (eval echo configure:2046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2056: \"$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 @@ -2062,7 +2072,7 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:2066: checking size of float" >&5 +echo "configure:2076: 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 @@ -2070,7 +2080,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2074 "configure" +#line 2084 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2081,7 +2091,7 @@ main() exit(0); } EOF -if { (eval echo configure:2085: \"$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_float=`cat conftestval` else @@ -2103,7 +2113,7 @@ EOF # Check for sizes of pointers. echo $ac_n "checking size of char *""... $ac_c" 1>&6 -echo "configure:2107: checking size of char *" >&5 +echo "configure:2117: 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 @@ -2111,7 +2121,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2115 "configure" +#line 2125 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2122,7 +2132,7 @@ main() exit(0); } EOF -if { (eval echo configure:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2136: \"$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 @@ -2142,6 +2152,27 @@ EOF +# This may look bizarre, but the cygwin environment +# emulates /dev/null +echo $ac_n "checking the NULL device""... $ac_c" 1>&6 +echo "configure:2159: checking the NULL device" >&5 + +if test -d /dev ; then + NULL_DEVICE="/dev/null" +else + cat > NUL <<EOF +test +EOF + + if `cat NUL > /dev/null 2>/dev/null` ; then + NULL_DEVICE="NUL" + else + echo "Can't find NULL device !" + fi +fi + +echo "$ac_t""$NULL_DEVICE" 1>&6 + # Various flags diff --git a/lib/make/configure.in b/lib/make/configure.in index e17b2982..b6febc29 100644 --- a/lib/make/configure.in +++ b/lib/make/configure.in @@ -22,16 +22,24 @@ AC_CONFIG_HEADER(config.h) dnl Check the system type AC_CANONICAL_SYSTEM +# See if there are any preferred compilers for this system + +CCTK_CONFIG_STAGE="preferred-compilers" + +if test -r $srcdir/known-architectures/$host_os ; then +. $srcdir/known-architectures/$host_os +fi + dnl Checks for programs. AC_PROG_MAKE_SET -if test -z "$CC" ; then +#if test -z "$CC" ; then AC_PROG_CC -fi +#fi -if test -z "$CXX" ; then +#if test -z "$CXX" ; then AC_PROG_CXX -fi +#fi if test -z "$RANLIB" ; then AC_PROG_RANLIB @@ -90,6 +98,8 @@ cat > cctk_archdefs.h <<EOF #define _CCTK_ARCHDEFS_H_ EOF +CCTK_CONFIG_STAGE="misc" + if test -r $srcdir/known-architectures/$host_os ; then . $srcdir/known-architectures/$host_os fi @@ -184,6 +194,26 @@ AC_CHECK_SIZEOF(float) # Check for sizes of pointers. AC_CHECK_SIZEOF(char *) +# This may look bizarre, but the cygwin environment +# emulates /dev/null +AC_MSG_CHECKING(the NULL device) + +if test -d /dev ; then + NULL_DEVICE="/dev/null" +else + cat > NUL <<EOF +test +EOF + + if `cat NUL > /dev/null 2>/dev/null` ; then + NULL_DEVICE="NUL" + else + echo "Can't find NULL device !" + fi +fi + +AC_MSG_RESULT($NULL_DEVICE) + # Various flags AC_SUBST(ARFLAGS) diff --git a/lib/make/known-architectures/aix b/lib/make/known-architectures/aix index 3fb90b2e..279a610e 100644 --- a/lib/make/known-architectures/aix +++ b/lib/make/known-architectures/aix @@ -9,24 +9,31 @@ # @version $Header$ # @@*/ -: ${F90FLAGS="-g -O2 -qfixed"} -: ${F77FLAGS="-g -O2 -qfixed"} +if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then -: ${C_DEPEND_OUT=' > $@'} -: ${CXX_DEPEND_OUT=' > $@'} -: ${F_DEPEND_OUT=' > /dev/null ; mv $(basename $(@)).u $@'} -: ${F77_DEPEND_OUT=' > /dev/null ; mv $(basename $(@)).u $@'} +: -: ${LIBS="xlf90"} +else + : ${F90FLAGS="-g -O2 -qfixed"} + : ${F77FLAGS="-g -O2 -qfixed"} -# MPI stuff + : ${C_DEPEND_OUT=' > $@'} + : ${CXX_DEPEND_OUT=' > $@'} + : ${F_DEPEND_OUT=' > /dev/null ; mv $(basename $(basename $@)).u $@'} + : ${F77_DEPEND_OUT=' > /dev/null ; mv $(basename $(basename $@)).u $@'} + + : ${LIBS="xlf90"} + + + # MPI stuff -if test -n "$MPI" ; then - if test "$MPI" = "NATIVE" ; then - MPI_LIBS="mpi" - MPI_LIB_DIRS="/usr/lpp/ppe.poe/lib" - MPI_INC_DIRS="/usr/lpp/ppe.poe/include" - fi -fi + if test -n "$MPI" ; then + if test "$MPI" = "NATIVE" ; then + MPI_LIBS="mpi" + MPI_LIB_DIRS="/usr/lpp/ppe.poe/lib" + MPI_INC_DIRS="/usr/lpp/ppe.poe/include" + fi + fi +fi diff --git a/lib/make/known-architectures/cygwin b/lib/make/known-architectures/cygwin index 44f19770..440e16a0 100644 --- a/lib/make/known-architectures/cygwin +++ b/lib/make/known-architectures/cygwin @@ -10,55 +10,76 @@ # @version $Header$ # @@*/ +if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then -echo Setting compiler to cl -CC="cl" -CXX="cl" + if test -z "$CC"; then + echo Setting C compiler to cl + CC="cl" + fi -echo Setting linker to f90 -LD="f90" + if test -z "$CXX"; then + echo Setting C++ compiler to cl + CXX="cl" + fi + + if test -z "$LD"; then + echo Setting linker to f90 + LD="f90" + fi + +else # /Gd means use __cdecl, it's /Gz for __stdcall -CFLAGS="/nologo /Oxy- /Gd" -CXXFLAGS="/nologo /TP /Oxy- /Gd" -F90FLAGS="/fast /iface:cref" + if test -z "$CFLAGS"; then + CFLAGS="/nologo /Oxy- /Gd" + fi + + if test -z "CXXFLAGS" ; then + CXXFLAGS="/nologo /TP /Oxy- /Gd" + fi -CCOMPILEONLY="/c /Fo" -FCOMPILEONLY="/compile_only /object:" + if test -z "CXXFLAGS" ; then + F90FLAGS="/fast /iface:cref" + fi -CREATEEXE="-exe:" + CCOMPILEONLY="/c /Fo" + FCOMPILEONLY="/compile_only /object:" -SYS_INC_DIRS="/PROGRA~/MICROS~1/VC98/INCLUDE" + CREATEEXE="-exe:" -DIRSEP="\\\\" + SYS_INC_DIRS="/PROGRA~/MICROS~1/VC98/INCLUDE" -OPTIONSEP="# not even a single a single space under cygwin" + DIRSEP="\\\\" + + OPTIONSEP="# not even a single a single space under cygwin" # Convert //a to a: -GET_WD="pwd | sed 's,^//\(.\)/,\1:/,' | sed 's,/,\\\\\\,g' " + GET_WD="pwd | sed 's,^//\(.\)/,\1:/,' | sed 's,/,\\\\\\,g' " -C_DEPEND='$(CPP) -E -MM -nostdinc $(CPPFLAGS) ' + C_DEPEND='$(CPP) -E -MM -nostdinc $(CPPFLAGS) ' -CXX_DEPEND='$(CPP) -E -MM -nostdinc $(CPPFLAGS) ' + CXX_DEPEND='$(CPP) -E -MM -nostdinc $(CPPFLAGS) ' -MKDIR="mkdir " -MKDIRFLAGS=" -p " + MKDIR="mkdir " + MKDIRFLAGS=" -p " -CACTUSLIBLINKLINE='$(addsuffix .a,$(addprefix $(subst /,$(DIRSEP),$(CCTK_LIBDIR))$(DIRSEP)lib,$(notdir $(ALLCACTUSLIBS))))' + CACTUSLIBLINKLINE='$(addsuffix .a,$(addprefix $(subst /,$(DIRSEP),$(CCTK_LIBDIR))$(DIRSEP)lib,$(notdir $(ALLCACTUSLIBS))))' # Windows libraries have to explicitly appear on the link line with full name # So ignore the LIBDIRS variable and don't put flags on. -GENERAL_LIBRARIES='$(LIBS)' + GENERAL_LIBRARIES='$(LIBS)' -cat >> cctk_archdefs.h <<EOF; + cat >> cctk_archdefs.h <<EOF; /* WIN stuff */ #define WIN32 EOF +fi + diff --git a/lib/make/known-architectures/hp-ux b/lib/make/known-architectures/hp-ux index 1ecc115f..86528a71 100644 --- a/lib/make/known-architectures/hp-ux +++ b/lib/make/known-architectures/hp-ux @@ -6,13 +6,20 @@ # @desc # Known architecture stuff for the NCSA Exemplar # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/hp-ux,v 1.5 1999-08-30 15:05:29 allen Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/hp-ux,v 1.6 1999-10-11 13:49:08 goodale Exp $ # @@*/ -: ${LIBS="cl F90 "} -: ${LIBDIRS="/opt/fortran90/lib/"} -: ${F77_DEPEND='$(CPP) -M$@ $(CPPFLAGS)'} -: ${F_DEPEND='$(CPP) -M$@ $(CPPFLAGS)'} -: ${F77_DEPEND_OUT="> /dev/null; perl -p -i -e 's/\.F77\.o/\.o/g' $(basename $(@)).d "} -: ${F_DEPEND_OUT='> /dev/null'} +if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then +: + +else + + : ${LIBS="cl F90 "} + : ${LIBDIRS="/opt/fortran90/lib/"} + : ${F77_DEPEND='$(CPP) -M$@ $(CPPFLAGS)'} + : ${F_DEPEND='$(CPP) -M$@ $(CPPFLAGS)'} + : ${F77_DEPEND_OUT="> /dev/null; perl -p -i -e 's/\.F77\.o/\.o/g' $(basename $(@)).d "} + : ${F_DEPEND_OUT='> /dev/null'} + +fi diff --git a/lib/make/known-architectures/irix b/lib/make/known-architectures/irix index 0cd42f70..0b680978 100644 --- a/lib/make/known-architectures/irix +++ b/lib/make/known-architectures/irix @@ -6,33 +6,20 @@ # @desc # # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/irix,v 1.12 1999-09-14 16:17:38 goodale Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/irix,v 1.13 1999-10-11 13:49:08 goodale Exp $ # @@*/ +if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then + # extract the CPU type from hinv output # (assumes all processors are of equal type :-) -IRIX_CPU="`hinv -t cpu | tail -1 | sed 's/^[^R]*R\([01-9]*\).*$/\1/'`" - - -# Find out which version of the Fortran compilers is installed + IRIX_CPU="`hinv -t cpu | tail -1 | sed 's/^[^R]*R\([01-9]*\).*$/\1/'`" -IRIX_FVERSION="`versions ftn_dev | grep , | tail -1 | sed 's:.*, ::'`" - -IRIX_FMAJ="`echo $IRIX_FVERSION | sed 's:\([^. ]*\)\.\([^. ]*\).*:\1:'`" -IRIX_FMIN="`echo $IRIX_FVERSION | sed 's:\([^. ]*\)\.\([^. ]*\).*:\2:'`" - -if test $IRIX_FMAJ -gt 7 -o \( $IRIX_FMAJ -eq 7 -a $IRIX_FMIN -ge 2 \) ; then - IRIX_FLIBS="fortran ftn ftn90" -else - IRIX_FLIBS="ftn ftn90" -fi - - -if test -n "`uname | grep 64`" ; then - IRIX_BITS=64 -else - IRIX_BITS=32 -fi + if test -n "`uname | grep 64`" ; then + IRIX_BITS=64 + else + IRIX_BITS=32 + fi #case "$IRIX_BITS:$CC" in # 64:gcc) @@ -43,74 +30,105 @@ fi # ;; #esac -if test "$CC" = "gcc" ; then - echo "There seem to be some problems with the GNU compiler under irix, switching to cc" - echo "If you don't like this, you can edit your make.config.defn file." - CC=cc - CXX=CC - LD=CC -fi +# if test "$CC" = "gcc" ; then +# echo "There seem to be some problems with the GNU compiler under irix, switching to cc" +# echo "If you don't like this, you can edit your make.config.defn file." +# CC=cc +# CXX=CC +# LD=CC +# fi + + if test -z "$CC"; then + echo Setting C compiler to cc + CC="cc" + fi + if test -z "$CXX"; then + echo Setting C++ compiler to CC + CXX="CC" + fi + if test -z "$LD"; then + echo Setting linker to CC + LD="CC" + fi -case "$IRIX_BITS:$CC" in + + +else + + case "$IRIX_BITS:$CC" in 64:cc) - CFLAGS="$CFLAGS -O3 -64 -mips4 -r10000" - CXXFLAGS="$CXXFLAGS -O3 -64 -mips4 -r10000" - ;; + CFLAGS="$CFLAGS -O3 -64 -mips4 -r10000" + CXXFLAGS="$CXXFLAGS -O3 -64 -mips4 -r10000" + ;; 32:cc) - CFLAGS="$CFLAGS -O3 -n32 -mips3" - CXXFLAGS="$CXXFLAGS -O3 -n32 -mips3" - ;; + CFLAGS="$CFLAGS -O3 -n32 -mips3" + CXXFLAGS="$CXXFLAGS -O3 -n32 -mips3" + ;; *) - ;; -esac + ;; + esac -case "$IRIX_BITS" in + case "$IRIX_BITS" in 64) - F90FLAGS="$F90FLAGS -O3 \ + F90FLAGS="$F90FLAGS -O3 \ -OPT:roundoff=3:IEEE_arithmetic=3:const_copy_limit=100000 \ -r10000 -TARG:proc=r10000 \ -64 -mips4" - F77FLAGS="$F90FLAGS" - ;; + F77FLAGS="$F90FLAGS" + ;; 32) - F90FLAGS="-O3 \ + F90FLAGS="-O3 \ -OPT:roundoff=3:IEEE_arithmetic=3:fold_arith_limit=10000:const_copy_limit=100000 \ -n32 -mips3" - F77FLAGS="$F90FLAGS" - ;; + F77FLAGS="$F90FLAGS" + ;; *) - ;; + ;; esac case "$IRIX_BITS:$LD" in 64:CC) - LDFLAGS="$LDFLAGS -64 -Wl,\"-woff 84\",\"-woff 85\"" - ;; + LDFLAGS="$LDFLAGS -64 -Wl,\"-woff 84\",\"-woff 85\"" + ;; 32:CC) - LDFLAGS="$LDFLAGS -n32 -Wl,\"-woff 84\",\"-woff 85\"" - ;; + LDFLAGS="$LDFLAGS -n32 -Wl,\"-woff 84\",\"-woff 85\"" + ;; *) - ;; + ;; esac -case $IRIX_BITS in +# Find out which version of the Fortran compilers is installed + + IRIX_FVERSION="`versions ftn_dev | grep , | tail -1 | sed 's:.*, ::'`" + + IRIX_FMAJ="`echo $IRIX_FVERSION | sed 's:\([^. ]*\)\.\([^. ]*\).*:\1:'`" + IRIX_FMIN="`echo $IRIX_FVERSION | sed 's:\([^. ]*\)\.\([^. ]*\).*:\2:'`" + + if test $IRIX_FMAJ -gt 7 -o \( $IRIX_FMAJ -eq 7 -a $IRIX_FMIN -ge 2 \) ; then + IRIX_FLIBS="fortran ftn ftn90" + else + IRIX_FLIBS="ftn ftn90" + fi + + case $IRIX_BITS in 64) - LIBS="$LIBS malloc perfex fpe $IRIX_FLIBS m" - ;; + LIBS="$LIBS malloc perfex fpe $IRIX_FLIBS m" + ;; 32) - LIBS="$LIBS malloc fpe $IRIX_FLIBS m" - ;; + LIBS="$LIBS malloc fpe $IRIX_FLIBS m" + ;; *) - ;; -esac + ;; + esac # MPI stuff -if test -n "$MPI" ; then + if test -n "$MPI" ; then if test "$MPI" = "NATIVE" ; then - MPI_LIBS="mpi" + MPI_LIBS="mpi" fi -fi + fi +fi
\ No newline at end of file diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux index 309c4a53..abbd0845 100644 --- a/lib/make/known-architectures/linux +++ b/lib/make/known-architectures/linux @@ -9,10 +9,16 @@ # @version $Header$ # @@*/ +if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then + +: + +else + # Determine which Fortran 90 compiler is in use -LINUX_F90_COMP= + LINUX_F90_COMP= -if test -n "$F90" ; then + if test -n "$F90" ; then if test "`$F90 -V 2>&1 | grep -i f90 | grep -i vast`" ; then LINUX_F90_COMP=pacific elif test "`$F90 -V 2>&1 | grep -i f90 | grep -i absoft`" ; then @@ -32,44 +38,52 @@ if test -n "$F90" ; then echo ad send the updated file to CactusMaint echo We will try anyway ... fi -else + else LINUX_F90_COMP=none -fi + fi #Set the appropriate flags -case "$LINUX_F90_COMP" in + case "$LINUX_F90_COMP" in pacific) - : ${LIBS="vast90 g2c m"} ;; + : ${LIBS="vast90 g2c m"} ;; absoft) - : ${LIBS="f90math fio f77math m"} - F90FLAGS="-s -O" - # Test if it is a version of the absoft compiler which has the library in a custom place. - if test -n "$ABSOFT" ; then - : ${LIBDIRS='$(ABSOFT)/lib'} - fi ;; + : ${LIBS="f90math fio f77math m"} + F90FLAGS="-s -O" + # Test if it is a version of the absoft compiler which has the library in a custom place. + if test -n "$ABSOFT" ; then + : ${LIBDIRS='$(ABSOFT)/lib'} + fi + ;; absoft77) - : ${LIBS="fio f77math m"} - F90FLAGS="-f" - # Test if it is a version of the absoft compiler which has the library in a custom place. - if test -n "$ABSOFT" ; then - : ${LIBDIRS='$(ABSOFT)/lib'} - fi ;; + : ${LIBS="fio f77math m"} + F90FLAGS="-f" + # Test if it is a version of the absoft compiler which has the library in a custom place. + if test -n "$ABSOFT" ; then + : ${LIBDIRS='$(ABSOFT)/lib'} + fi + ;; nag) - : ${LIBS="f90 nagfl90 nag m"} - F90FLAGS="$F90FLAGS -N140" ;; + : ${LIBS="f90 nagfl90 nag m"} + F90FLAGS="$F90FLAGS -N140" + ;; portland) - : ${LIBS="pgf90 pgf90_rpm1 pghpf2 pgf90rtl pgc m"} - : ${LIBDIRS='$(PGI)/linux86/lib'} ;; + : ${LIBS="pgf90 pgf90_rpm1 pghpf2 pgf90rtl pgc m"} + : ${LIBDIRS='$(PGI)/linux86/lib'} + ;; fujitsu) - : ${LIBS="fj9i6 fj9e6 fj9f6"} ;; + : ${LIBS="fj9i6 fj9e6 fj9f6"} + ;; none) - : ${LIBS="m"} ;; - *) - echo Unknown Linux f90 compiler. - echo Please add appropriate information to - echo $srcdir/known-architectures/linux-gnu - echo and send the updated file to CactusMaint - echo We will try anyway ... - ;; -esac + : ${LIBS="m"} + ;; + *) + echo Unknown Linux f90 compiler. + echo Please add appropriate information to + echo $srcdir/known-architectures/linux-gnu + echo and send the updated file to CactusMaint + echo We will try anyway ... + ;; + esac + +fi diff --git a/lib/make/known-architectures/osf b/lib/make/known-architectures/osf index 87c8a71b..8649cafb 100644 --- a/lib/make/known-architectures/osf +++ b/lib/make/known-architectures/osf @@ -6,8 +6,15 @@ # @desc # # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/osf,v 1.1 1999-04-22 13:21:59 allen Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/osf,v 1.2 1999-10-11 13:49:09 goodale Exp $ # @@*/ -: ${LIBS="for"} +if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then +: + +else + + : ${LIBS="for"} + +fi
\ No newline at end of file diff --git a/lib/make/known-architectures/unicos b/lib/make/known-architectures/unicos index 9749c5b5..b524e144 100644 --- a/lib/make/known-architectures/unicos +++ b/lib/make/known-architectures/unicos @@ -6,23 +6,32 @@ # @desc # # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/unicos,v 1.3 1999-07-06 20:19:13 goodale Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/unicos,v 1.4 1999-10-11 13:49:09 goodale Exp $ # @@*/ -# The T3E F90 compiler uses -b if you want to supply a name for a .o file. -: ${FCOMPILEONLY="-b"} +if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then -# The T3E fortran compiler puts module info in .o files by default. -: ${F90FLAGS="-O scalar3,noieeeconform,unroll2,inline3 -dp -em"} +: -: ${LIBS="_ereg _perf_mjp _util _vect"} +else -: ${LIBDIRS='$(CCTK_HOME)/lib/archlibs/t3e'} + # The T3E F90 compiler uses -b if you want to supply a name for a .o file. + : ${FCOMPILEONLY="-b"} -cat >> cctk_archdefs.h <<EOF + # The T3E fortran compiler puts module info in .o files by default. + : ${F90FLAGS="-O scalar3,noieeeconform,unroll2,inline3 -dp -em"} + + : ${LIBS="_ereg _perf_mjp _util _vect"} + + : ${LIBDIRS='$(CCTK_HOME)/lib/archlibs/t3e'} + + cat >> cctk_archdefs.h <<EOF /* T3E stuff */ #define T3E EOF + + +fi |