configure.in: Adjust include paths in F2C_INTEGER and F2C_LONGINT tests to work out of the...

* configure.in: Adjust include paths in F2C_INTEGER and F2C_LONGINT
tests to work out of the build directory.

From-SVN: r19419

3 files changed, 30 insertions, 9 deletions

diff --git a/libf2c/ChangeLog.egcs b/libf2c/ChangeLog.egcs
index 3c0bcb1..d3978cd 100644
--- a/libf2c/ChangeLog.egcs
+++ b/libf2c/ChangeLog.egcs
@@ -1,3 +1,8 @@
+Sun Apr 26 18:07:56 1998  Richard Henderson  <rth@cygnus.com>
+
+	* configure.in: Adjust include paths in F2C_INTEGER and F2C_LONGINT
+	tests to work out of the build directory.
+
 1998-02-17  Dave Love  <d.love@dl.ac.uk>
 
 	* libU77/u77-test.f: Tweak some o/p.
diff --git a/libf2c/configure b/libf2c/configure
index e35980d1..b4bfd40 100755
--- a/libf2c/configure
+++ b/libf2c/configure
@@ -1719,12 +1719,16 @@ 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
-ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../gcc/config"
+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"
+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
-#line 1728 "configure"
+#line 1732 "configure"
 #include "confdefs.h"
 #include "proj.h"
 #define FFECOM_DETERMINE_TYPES 1
@@ -1747,7 +1751,7 @@ rm -f conftest*
 
 if test "$g77_cv_sys_f2cinteger" = ""; then
   cat > conftest.$ac_ext <<EOF
-#line 1751 "configure"
+#line 1755 "configure"
 #include "confdefs.h"
 #include "proj.h"
 #define FFECOM_DETERMINE_TYPES 1
@@ -1782,14 +1786,18 @@ ac_cpp=$late_ac_cpp
 
 
 echo $ac_n "checking f2c long int type""... $ac_c" 1>&6
-echo "configure:1786: checking f2c long int type" >&5
+echo "configure:1790: checking f2c long int type" >&5
 late_ac_cpp=$ac_cpp
-ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../gcc/config"
+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"
+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 1793 "configure"
+#line 1801 "configure"
 #include "confdefs.h"
 #include "proj.h"
 #define FFECOM_DETERMINE_TYPES 1
@@ -1812,7 +1820,7 @@ rm -f conftest*
 
 if test "$g77_cv_sys_f2clongint" = ""; then
   cat > conftest.$ac_ext <<EOF
-#line 1816 "configure"
+#line 1824 "configure"
 #include "confdefs.h"
 #include "proj.h"
 #define FFECOM_DETERMINE_TYPES 1
diff --git a/libf2c/configure.in b/libf2c/configure.in
index 232b2d4..3320f48 100644
--- a/libf2c/configure.in
+++ b/libf2c/configure.in
@@ -253,7 +253,11 @@ fi
 # is in ../.. and the config files are in $srcdir/../../config.
 AC_MSG_CHECKING(f2c integer type)
 late_ac_cpp=$ac_cpp
-ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../gcc/config"
+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"
+fi
 AC_CACHE_VAL(g77_cv_sys_f2cinteger,
 AC_EGREP_CPP(F2C_INTEGER=long int,
 [#include "proj.h"
@@ -295,7 +299,11 @@ AC_SUBST(F2C_INTEGER)
 
 AC_MSG_CHECKING(f2c long int type)
 late_ac_cpp=$ac_cpp
-ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../gcc/config"
+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"
+fi
 AC_CACHE_VAL(g77_cv_sys_f2clongint,
 AC_EGREP_CPP(F2C_LONGINT=long int,
 [#include "proj.h"