diff --git a/libf2c/ChangeLog.egcs b/libf2c/ChangeLog.egcs
index a37b6e62265798216c220d04ea45b20fdc532aa0..17e05b7ad8261332377a18f0e923e60427a6cf6b 100644
--- a/libf2c/ChangeLog.egcs
+++ b/libf2c/ChangeLog.egcs
@@ -1,3 +1,8 @@
+Mon Feb  2 11:08:49 1998  Richard Henderson  <rth@cygnus.com>
+
+	* configure.in: Update F2C_INTEGER and F2C_LONGINT tests
+	for the new placement in the hierarchy.
+
 Sun Feb  1 02:36:33 1998  Richard Henderson  <rth@cygnus.com>
 
 	* Previous contents of gcc/f/runtime moved into toplevel
diff --git a/libf2c/configure b/libf2c/configure
index 1dc6f4cde3c5ac754fecbd62a14cd2faaf45d0e1..b62dec90b9a397f5c5f58a5765b2fa679829e970 100755
--- a/libf2c/configure
+++ b/libf2c/configure
@@ -1657,7 +1657,7 @@ fi
 echo $ac_n "checking f2c integer type""... $ac_c" 1>&6
 echo "configure:1659: checking f2c integer type" >&5
 late_ac_cpp=$ac_cpp
-ac_cpp="$late_ac_cpp -I$srcdir/.. -I../.. -I$srcdir/../.. -I$srcdir/../../config"
+ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../gcc/config"
 if eval "test \"`echo '$''{'g77_cv_sys_f2cinteger'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1722,7 +1722,7 @@ ac_cpp=$late_ac_cpp
 echo $ac_n "checking f2c long int type""... $ac_c" 1>&6
 echo "configure:1724: checking f2c long int type" >&5
 late_ac_cpp=$ac_cpp
-ac_cpp="$late_ac_cpp -I$srcdir/.. -I../.. -I$srcdir/../.. -I$srcdir/../../config"
+ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../gcc/config"
 if eval "test \"`echo '$''{'g77_cv_sys_f2clongint'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/libf2c/configure.in b/libf2c/configure.in
index 1c93ff324892d18f95d67e5bc7b13c6d09103fc1..6bd6518e0765c4fa70da2672ba16e9f8bf28387d 100644
--- a/libf2c/configure.in
+++ b/libf2c/configure.in
@@ -246,7 +246,7 @@ 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/.. -I../.. -I$srcdir/../.. -I$srcdir/../../config"
+ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../gcc/config"
 AC_CACHE_VAL(g77_cv_sys_f2cinteger,
 AC_EGREP_CPP(F2C_INTEGER=long int,
 [#include "proj.h"
@@ -288,7 +288,7 @@ AC_SUBST(F2C_INTEGER)
 
 AC_MSG_CHECKING(f2c long int type)
 late_ac_cpp=$ac_cpp
-ac_cpp="$late_ac_cpp -I$srcdir/.. -I../.. -I$srcdir/../.. -I$srcdir/../../config"
+ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../gcc/config"
 AC_CACHE_VAL(g77_cv_sys_f2clongint,
 AC_EGREP_CPP(F2C_LONGINT=long int,
 [#include "proj.h"