diff options
| author | Richard Henderson <rth@gcc.gnu.org> | 1998-04-27 15:46:10 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 1998-04-27 15:46:10 -0700 |
| commit | 8746c235643f933be01161215004993606b94a8a (patch) | |
| tree | 0fd39616303db543e7546f114e042dc7e4d283ed /libf2c | |
| parent | f163f35b5ba5c8855c547ca2f0cca37b5ec5b1c0 (diff) | |
| download | gcc-8746c235643f933be01161215004993606b94a8a.zip gcc-8746c235643f933be01161215004993606b94a8a.tar.gz gcc-8746c235643f933be01161215004993606b94a8a.tar.bz2 | |
One more try at correct paths to f771 headers.
From-SVN: r19456
Diffstat (limited to 'libf2c')
| -rwxr-xr-x | libf2c/configure | 30 | ||||
| -rw-r--r-- | libf2c/configure.in | 18 |
2 files changed, 26 insertions, 22 deletions
diff --git a/libf2c/configure b/libf2c/configure index b4bfd40..45788f6 100755 --- a/libf2c/configure +++ b/libf2c/configure @@ -1719,15 +1719,15 @@ fi echo $ac_n "checking f2c integer type""... $ac_c" 1>&6 echo "configure:1721: checking f2c integer type" >&5 late_ac_cpp=$ac_cpp -if test "$srcdir" = . ; then - ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" -else - ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" +ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" +if test "$subdir" != . ; then + ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" fi if eval "test \"`echo '$''{'g77_cv_sys_f2cinteger'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext <<EOF + echo "configure:1730: using $ac_cpp" >&5 +cat > conftest.$ac_ext <<EOF #line 1732 "configure" #include "confdefs.h" #include "proj.h" @@ -1750,8 +1750,9 @@ fi rm -f conftest* if test "$g77_cv_sys_f2cinteger" = ""; then +echo "configure:1754: using $ac_cpp" >&5 cat > conftest.$ac_ext <<EOF -#line 1755 "configure" +#line 1756 "configure" #include "confdefs.h" #include "proj.h" #define FFECOM_DETERMINE_TYPES 1 @@ -1786,18 +1787,18 @@ ac_cpp=$late_ac_cpp echo $ac_n "checking f2c long int type""... $ac_c" 1>&6 -echo "configure:1790: checking f2c long int type" >&5 +echo "configure:1791: checking f2c long int type" >&5 late_ac_cpp=$ac_cpp -if test "$srcdir" = . ; then - ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" -else - ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" +ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" +if test "$subdir" != . ; then + ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" fi if eval "test \"`echo '$''{'g77_cv_sys_f2clongint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext <<EOF -#line 1801 "configure" + echo "configure:1800: using $ac_cpp" >&5 +cat > conftest.$ac_ext <<EOF +#line 1802 "configure" #include "confdefs.h" #include "proj.h" #define FFECOM_DETERMINE_TYPES 1 @@ -1819,8 +1820,9 @@ fi rm -f conftest* if test "$g77_cv_sys_f2clongint" = ""; then +echo "configure:1824: using $ac_cpp" >&5 cat > conftest.$ac_ext <<EOF -#line 1824 "configure" +#line 1826 "configure" #include "confdefs.h" #include "proj.h" #define FFECOM_DETERMINE_TYPES 1 diff --git a/libf2c/configure.in b/libf2c/configure.in index 3320f48..69d05d7 100644 --- a/libf2c/configure.in +++ b/libf2c/configure.in @@ -253,12 +253,12 @@ fi # is in ../.. and the config files are in $srcdir/../../config. AC_MSG_CHECKING(f2c integer type) late_ac_cpp=$ac_cpp -if test "$srcdir" = . ; then - ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" -else - ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" +ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" +if test "$subdir" != . ; then + ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" fi AC_CACHE_VAL(g77_cv_sys_f2cinteger, +echo "configure:__oline__: using $ac_cpp" >&AC_FD_CC AC_EGREP_CPP(F2C_INTEGER=long int, [#include "proj.h" #define FFECOM_DETERMINE_TYPES 1 @@ -273,6 +273,7 @@ F2C_INTEGER=int ], g77_cv_sys_f2cinteger="long int",) if test "$g77_cv_sys_f2cinteger" = ""; then +echo "configure:__oline__: using $ac_cpp" >&AC_FD_CC AC_EGREP_CPP(F2C_INTEGER=int, [#include "proj.h" #define FFECOM_DETERMINE_TYPES 1 @@ -299,12 +300,12 @@ AC_SUBST(F2C_INTEGER) AC_MSG_CHECKING(f2c long int type) late_ac_cpp=$ac_cpp -if test "$srcdir" = . ; then - ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" -else - ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" +ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" +if test "$subdir" != . ; 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, [#include "proj.h" #define FFECOM_DETERMINE_TYPES 1 @@ -319,6 +320,7 @@ F2C_LONGINT=long long int ], 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, [#include "proj.h" #define FFECOM_DETERMINE_TYPES 1 |