diff --git a/ChangeLog b/ChangeLog
index efb189028002da7a08f58ec57c6da21c6f916bc6..6987dc43f288267b803431667e3b809546f2382b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-01  DJ Delorie  <dj@redhat.com>
+
+	* configure.in: Restore CFLAGS if GM P isn't present.
+	* configure: Regenerate.
+
 2006-05-01  Richard Guenther  <rguenther@suse.de>
 
 	* MAINTAINERS (Various Maintainers): Add myself as libgcc-math
diff --git a/configure b/configure
index 19f68372d7e9a2e5c6cc3d76b0530976d209435d..36927a3044fdb4f1fcc98c472aa42e2f4d4e78ec 100755
--- a/configure
+++ b/configure
@@ -2354,8 +2354,8 @@ else
 fi
 rm -f conftest*
   LIBS="$saved_LIBS"
-  CFLAGS="$saved_CFLAGS"
 fi
+CFLAGS="$saved_CFLAGS"
 
 # Flags needed for both GMP and/or MPFR
 
diff --git a/configure.in b/configure.in
index 128116753c51483ffa2016208cecc8e83d07df57..04c922fd8185fee680dfcd1112147bebf82758de 100644
--- a/configure.in
+++ b/configure.in
@@ -1142,8 +1142,8 @@ if test x"$have_gmp" = xyes; then
 #include <mpfr.h>], [mpfr_t n; mpfr_init(n);],
     [AC_MSG_RESULT([yes])],  [AC_MSG_RESULT([no]); have_gmp=no])
   LIBS="$saved_LIBS"
-  CFLAGS="$saved_CFLAGS"
 fi
+CFLAGS="$saved_CFLAGS"
 
 # Flags needed for both GMP and/or MPFR
 AC_SUBST(gmplibs)