diff --git a/configure b/configure
index 5d95e953e3c..fbdee04d019 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 52363 .
+# From configure.in Revision: 52387 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.6.
 #
@@ -4098,6 +4098,7 @@ echo "${ECHO_T}no" >&6
 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$save_CFLAGS
 fi
 
 # On some compilers, pthreads are available without further options
diff --git a/configure.in b/configure.in
index 4ab84ddea86..41c0eb5d913 100644
--- a/configure.in
+++ b/configure.in
@@ -903,6 +903,7 @@ then
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
   )
+  CFLAGS=$save_CFLAGS
 fi
 
 # On some compilers, pthreads are available without further options