diff --git a/ChangeLog b/ChangeLog
index fa9d2939cf1..cc1f34cbfea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-08-20  Geoffrey Keating  <geoffk@apple.com>
 
+	PR 8180
+	* configure.in: When testing with_libs and with_headers, treat
+	'no' as unset.  Based on a patch by Dan Kegel <dank@kegel.com>.
+	* configure: Regenerate.
+	
 	* configure.in (TOPLEVEL_CONFIGURE_ARGUMENTS): Quote properly for
 	make, shell, etc.
 	(baseargs): Likewise.
diff --git a/configure.in b/configure.in
index b30f5242e71..5c461fc8049 100644
--- a/configure.in
+++ b/configure.in
@@ -253,7 +253,8 @@ esac
 
 # If both --with-headers and --with-libs are specified, default to
 # --without-newlib.
-if test x"${with_headers}" != x && test x"${with_libs}" != x ; then
+if test x"${with_headers}" != x && test x"${with_headers} != xno \
+   && test x"${with_libs}" != x && test x"${with_libs} != xno ; then
   if test x"${with_newlib}" = x ; then
     with_newlib=no
   fi
@@ -937,7 +938,7 @@ copy_dirs=
 
 # Handle --with-headers=XXX.  If the value is not "yes", the contents of
 # the named directory are copied to $(tooldir)/sys-include.
-if test x"${with_headers}" != x ; then
+if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
   if test x${is_cross_compiler} = xno ; then
     echo 1>&2 '***' --with-headers is only supported when cross compiling
     exit 1
@@ -954,7 +955,7 @@ fi
 # Handle --with-libs=XXX.  If the value is not "yes", the contents of
 # the name directories are copied to $(tooldir)/lib.  Multiple directories
 # are permitted.
-if test x"${with_libs}" != x ; then
+if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
   if test x${is_cross_compiler} = xno ; then
     echo 1>&2 '***' --with-libs is only supported when cross compiling
     exit 1
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b59d8bada8b..dc01407d87d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,8 +1,15 @@
-2003-08-06  Peter Barada <peter@baradas.org>
+2003-08-20  Geoffrey Keating  <geoffk@apple.com>
+
+	PR 8180
+	* configure.in: When testing with_libs and with_headers, treat
+	'no' as unset.  Based on a patch by Dan Kegel <dank@kegel.com>.
+	* configure: Regenerate.
+	
+2003-08-20  Peter Barada <peter@baradas.org>
 
 	* longlong.h (umul_ppmm): Add ColdFire support.
 
-2003-08-06  Peter Barada <peter@baradas.org>
+2003-08-20  Peter Barada <peter@baradas.org>
             Bernardo Innocenti  <bernie@develer.com>
 
 	* config/m68k/m68k-none.h: Introduce new ColdFire archs.
diff --git a/gcc/configure b/gcc/configure
index 5ec0828009a..9a2c150eab2 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -5744,7 +5744,7 @@ fi
 inhibit_libc=
 if { { test x$host != x$target && test "x$with_sysroot" = x ; } ||
        test x$with_newlib = xyes ; } &&
-     test "x$with_headers" = x ; then
+     { test "x$with_headers" = x || test "x$with_headers" = xno ; } ; then
        inhibit_libc=-Dinhibit_libc
 fi
 
diff --git a/gcc/configure.in b/gcc/configure.in
index 6360c2488ba..824008e4e69 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1449,7 +1449,7 @@ fi
 inhibit_libc=
 if { { test x$host != x$target && test "x$with_sysroot" = x ; } ||
        test x$with_newlib = xyes ; } &&
-     test "x$with_headers" = x ; then
+     { test "x$with_headers" = x || test "x$with_headers" = xno ; } ; then
        inhibit_libc=-Dinhibit_libc
 fi
 AC_SUBST(inhibit_libc)