From d76e5e59c81e0981468b252fbf40c421e95f457e Mon Sep 17 00:00:00 2001 From: Dave Love Date: Sun, 28 Mar 1999 03:18:32 +0000 Subject: [PATCH] configure: Rebuilt. * configure: Rebuilt. * configure.in: Fix integer size tests: sanity check first; search toplevel include dir (from Rainer Orth); only mess with ac_cpp once; use -DIN_GCC -DHAVE_CONFIG_H. * configure.in: Use `g77_cv_...', not `f77_cv_...'. From-SVN: r26035 --- libf2c/ChangeLog | 10 ++++++ libf2c/configure | 79 ++++++++++++++++++++++++++++++--------------- libf2c/configure.in | 40 +++++++++++++++-------- 3 files changed, 89 insertions(+), 40 deletions(-) diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog index 524eb2696f7..504bb9b3ba4 100644 --- a/libf2c/ChangeLog +++ b/libf2c/ChangeLog @@ -1,3 +1,13 @@ +1999-03-28 Dave Love + + * configure: Rebuilt. + + * configure.in: Fix integer size tests: sanity check first; search + toplevel include dir (from Rainer Orth); only mess with ac_cpp + once; use -DIN_GCC -DHAVE_CONFIG_H. + + * configure.in: Use `g77_cv_...', not `f77_cv_...'. + Wed Mar 24 22:41:28 1999 Mumit Khan * configure.in (AC_PREREQ): Update to 2.13. diff --git a/libf2c/configure b/libf2c/configure index cda185f1b55..b2ea4dbc855 100755 --- a/libf2c/configure +++ b/libf2c/configure @@ -658,17 +658,17 @@ compiler_name=f771 rm -f skip-this-dir echo $ac_n "checking if compiler $compiler_name has been built""... $ac_c" 1>&6 echo "configure:661: checking if compiler $compiler_name has been built" >&5 -if eval "test \"`echo '$''{'f77_cv_compiler_exists'+set}'`\" = set"; then +if eval "test \"`echo '$''{'g77_cv_compiler_exists'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - f77_cv_compiler_exists=yes + g77_cv_compiler_exists=yes if test -n "$r"; then if test -d "$r"/gcc; then if test -f "$r"/gcc/$compiler_name \ || test -f "$r"/gcc/$compiler_name$EXEEXT; then true else - f77_cv_compiler_exists=no + g77_cv_compiler_exists=no echo "rm -f config.cache config.log multilib.out" > skip-this-dir fi fi @@ -676,8 +676,8 @@ fi fi -echo "$ac_t""$f77_cv_compiler_exists" 1>&6 -if test x$f77_cv_compiler_exists = xno +echo "$ac_t""$g77_cv_compiler_exists" 1>&6 +if test x$g77_cv_compiler_exists = xno then rm -f Makefile conftest* confdefs* core exit 0 @@ -1161,17 +1161,49 @@ fi # is in gcc/ and the config files are in gcc/config/. echo $ac_n "checking f2c integer type""... $ac_c" 1>&6 echo "configure:1164: checking f2c integer type" >&5 +# Set this back later below! late_ac_cpp=$ac_cpp -ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" +late_cflags=$CFLAGS +##gcc -c -DIN_GCC -DHAVE_CONFIG_H -I. -I/home/fx/c-e/egcs/gcc -I/home/fx/c-e/egcs/gcc/config -I/home/fx/c-e/egcs/gcc/../include /home/fx/c-e/egcs/gcc/f/proj.c if test "$srcdir" != . ; then - ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" + extra_includes="-I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../include -I$srcdir/../gcc/config" +else + extra_includes="-I../../gcc/f -I../../gcc -I../../include -I../../gcc/config" +fi +ac_cpp="$late_ac_cpp -DIN_GCC -DHAVE_CONFIG_H $extra_includes" + +# The AC_EGREP_CPPs below have been known to fail when the header +# path is wrong after things have been moved about; the cpp error status +# counts for nothing. First check that there aren't any errors from +# the headers. +CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DIN_GCC $extra_includes" +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: Can't run check for integer sizes -- see config.log" 1>&2; exit 1; } fi +rm -f conftest* +CFLAGS=$late_cflags + if eval "test \"`echo '$''{'g77_cv_sys_f2cinteger'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - echo "configure:1173: using $ac_cpp" >&5 + echo "configure:1205: using $ac_cpp" >&5 cat > conftest.$ac_ext <&5 +echo "configure:1229: using $ac_cpp" >&5 cat > conftest.$ac_ext <&6 F2C_INTEGER=$g77_cv_sys_f2cinteger -ac_cpp=$late_ac_cpp echo $ac_n "checking f2c long int type""... $ac_c" 1>&6 -echo "configure:1234: checking f2c long int type" >&5 -late_ac_cpp=$ac_cpp -ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" -if test "$srcdir" != . ; then - ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" -fi +echo "configure:1265: checking f2c long int type" >&5 if eval "test \"`echo '$''{'g77_cv_sys_f2clongint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - echo "configure:1243: using $ac_cpp" >&5 + echo "configure:1269: using $ac_cpp" >&5 cat > conftest.$ac_ext <&5 | fi rm -f conftest* + if test "$g77_cv_sys_f2clongint" = ""; then -echo "configure:1267: using $ac_cpp" >&5 +echo "configure:1294: using $ac_cpp" >&5 cat > conftest.$ac_ext <&6 F2C_LONGINT=$g77_cv_sys_f2clongint -ac_cpp=$late_ac_cpp +ac_cpp=$late_ac_cpp # avoid confusion in case the `makefile's from the f2c distribution have # got put here @@ -1344,7 +1371,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1348: checking host system type" >&5 +echo "configure:1375: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1365,7 +1392,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1369: checking target system type" >&5 +echo "configure:1396: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1383,7 +1410,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1387: checking build system type" >&5 +echo "configure:1414: checking build system type" >&5 build_alias=$build case "$build_alias" in diff --git a/libf2c/configure.in b/libf2c/configure.in index 56ecd94d1d8..a6520e69b58 100644 --- a/libf2c/configure.in +++ b/libf2c/configure.in @@ -47,22 +47,22 @@ AC_EXEEXT compiler_name=f771 rm -f skip-this-dir AC_MSG_CHECKING(if compiler $compiler_name has been built) -AC_CACHE_VAL(f77_cv_compiler_exists, -[f77_cv_compiler_exists=yes +AC_CACHE_VAL(g77_cv_compiler_exists, +[g77_cv_compiler_exists=yes if test -n "$r"; then if test -d "$r"/gcc; then if test -f "$r"/gcc/$compiler_name \ || test -f "$r"/gcc/$compiler_name$EXEEXT; then true else - f77_cv_compiler_exists=no + g77_cv_compiler_exists=no echo "rm -f config.cache config.log multilib.out" > skip-this-dir fi fi fi ]) -AC_MSG_RESULT($f77_cv_compiler_exists) -if test x$f77_cv_compiler_exists = xno +AC_MSG_RESULT($g77_cv_compiler_exists) +if test x$g77_cv_compiler_exists = xno then rm -f Makefile conftest* confdefs* core exit 0 @@ -98,11 +98,28 @@ then the target library, then build with \`LANGUAGES=f77'.])]) # (via com.h). proj.h and com.h are in gcc/f/, config.h which they need # is in gcc/ and the config files are in gcc/config/. AC_MSG_CHECKING(f2c integer type) +# Set this back later below! late_ac_cpp=$ac_cpp -ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" +late_cflags=$CFLAGS +##gcc -c -DIN_GCC -DHAVE_CONFIG_H -I. -I/home/fx/c-e/egcs/gcc -I/home/fx/c-e/egcs/gcc/config -I/home/fx/c-e/egcs/gcc/../include /home/fx/c-e/egcs/gcc/f/proj.c if test "$srcdir" != . ; then - ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" + extra_includes="-I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../include -I$srcdir/../gcc/config" +else + extra_includes="-I../../gcc/f -I../../gcc -I../../include -I../../gcc/config" fi +ac_cpp="$late_ac_cpp -DIN_GCC -DHAVE_CONFIG_H $extra_includes" + +# The AC_EGREP_CPPs below have been known to fail when the header +# path is wrong after things have been moved about; the cpp error status +# counts for nothing. First check that there aren't any errors from +# the headers. +CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DIN_GCC $extra_includes" +AC_TRY_COMPILE([#include "proj.h" +#define FFECOM_DETERMINE_TYPES 1 +#include "com.h"],,, +AC_MSG_ERROR([Can't run check for integer sizes -- see config.log])) +CFLAGS=$late_cflags + AC_CACHE_VAL(g77_cv_sys_f2cinteger, echo "configure:__oline__: using $ac_cpp" >&AC_FD_CC AC_EGREP_CPP(F2C_INTEGER=long int, @@ -141,15 +158,9 @@ fi ) AC_MSG_RESULT($g77_cv_sys_f2cinteger) F2C_INTEGER=$g77_cv_sys_f2cinteger -ac_cpp=$late_ac_cpp AC_SUBST(F2C_INTEGER) AC_MSG_CHECKING(f2c long int type) -late_ac_cpp=$ac_cpp -ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" -if test "$srcdir" != . ; then - ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" -fi AC_CACHE_VAL(g77_cv_sys_f2clongint, echo "configure:__oline__: using $ac_cpp" >&AC_FD_CC AC_EGREP_CPP(F2C_LONGINT=long int, @@ -165,6 +176,7 @@ F2C_LONGINT=long long int #endif ], g77_cv_sys_f2clongint="long int",) + if test "$g77_cv_sys_f2clongint" = ""; then echo "configure:__oline__: using $ac_cpp" >&AC_FD_CC AC_EGREP_CPP(F2C_LONGINT=long long int, @@ -188,8 +200,8 @@ fi ) AC_MSG_RESULT($g77_cv_sys_f2clongint) F2C_LONGINT=$g77_cv_sys_f2clongint -ac_cpp=$late_ac_cpp AC_SUBST(F2C_LONGINT) +ac_cpp=$late_ac_cpp # avoid confusion in case the `makefile's from the f2c distribution have # got put here -- 2.30.2