One more try at correct paths to f771 headers.

From-SVN: r19456

diff --git a/libf2c/configure b/libf2c/configure
index b4bfd40bc7c453a9ead9faa789085089bdcc49ab..45788f63e756f4c01e82897f2167028923a88bd9 100755 (executable)
--- 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 3320f483b8d12674afd3d1ab6afb99e6f9a5494a..69d05d7cdbdfc7c717f3c7c7bf8fdb55c984c838 100644 (file)
--- 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