diff --git a/ChangeLog b/ChangeLog
index f300ad32b23..56d989f5b0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-11  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in (have_gmp): Only error if the gcc directory exists.
+	
+	* configure: Regenerate.
+
 2006-11-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* configure.in: Robustify error message for missing GMP/MPFR.
diff --git a/configure b/configure
index 612aeae1a09..ea29f213ddd 100755
--- a/configure
+++ b/configure
@@ -2353,7 +2353,7 @@ rm -f conftest*
 fi
 CFLAGS="$saved_CFLAGS"
 
-if test x$have_gmp != xyes; then
+if test -d ${srcdir}/gcc && test x$have_gmp != xyes; then
   { echo "configure: error: Building GCC requires GMP 4.1+ and MPFR 2.2+.
 Try the --with-gmp and/or --with-mpfr options to specify their locations.
 Copies of these libraries' source code can be found at their respective
diff --git a/configure.in b/configure.in
index 2a8c4c2212d..ac5512f6601 100644
--- a/configure.in
+++ b/configure.in
@@ -1117,7 +1117,7 @@ if test x"$have_gmp" = xyes; then
 fi
 CFLAGS="$saved_CFLAGS"
 
-if test x$have_gmp != xyes; then
+if test -d ${srcdir}/gcc && test x$have_gmp != xyes; then
   AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.2+.
 Try the --with-gmp and/or --with-mpfr options to specify their locations.
 Copies of these libraries' source code can be found at their respective