diff --git a/libio/ChangeLog b/libio/ChangeLog
index 15095d836d3..aa546a46c4c 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-12  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* configure.in (compiler_name): Don't do the skip-this-dir thing
+	if we're reconfiguring.
+
 1999-04-29  Nathan Sidwell  <nathan@acm.org>
 
 	* streambuf.h (ios::~ios): Use operator delete[] to remove _arrays.
diff --git a/libio/configure.in b/libio/configure.in
index b2568e5a6be..084e901aabf 100644
--- a/libio/configure.in
+++ b/libio/configure.in
@@ -18,9 +18,11 @@ esac
 # does, we do not build anything. Note, $r is set by the top-level Makefile.
 # Note that when we look for the compiler, we search both with and without
 # extension to handle cross and canadian cross builds. 
+# Note that if $norecursion is set we're being called from config.status,
+# so don't check for the compiler; we might be doing a make clean.
 compiler_name=cc1plus
 rm -f skip-this-dir
-if test -n "$r"; then
+if test -n "$r" && [ -z "$norecursion" ] ; then
   if test -d "$r"/gcc; then
     if test -f "$r"/gcc/$compiler_name \
        || test -f "$r"/gcc/$compiler_name$EXEEXT; then
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index a75920e12ef..731a4404a2e 100644
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-12  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* configure.in (compiler_name): Don't do the skip-this-dir thing
+	if we're reconfiguring.
+
 1999-05-07  Ulrich Drepper  <drepper@cygnus.com>
 
 	* std/bastring.h (class basic_string::Rep): Make release member
diff --git a/libstdc++/configure.in b/libstdc++/configure.in
index 0f556cac551..c0c701398f1 100644
--- a/libstdc++/configure.in
+++ b/libstdc++/configure.in
@@ -18,9 +18,11 @@ esac
 # does, we do not build anything. Note, $r is set by the top-level Makefile.
 # Note that when we look for the compiler, we search both with and without
 # extension to handle cross and canadian cross builds. 
+# Note that if $norecursion is set we're being called from config.status,
+# so don't check for the compiler; we might be doing a make clean.
 compiler_name=cc1plus
 rm -f skip-this-dir
-if test -n "$r"; then
+if test -n "$r" && [ -z "$norecursion" ] ; then
   if test -d "$r"/gcc; then
     if test -f "$r"/gcc/$compiler_name \
        || test -f "$r"/gcc/$compiler_name$EXEEXT; then