From 6cbf90fc0fd552ec7689e5a885b278c05aa866ae Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 25 Mar 2010 00:21:53 +0000
Subject: [PATCH] Issue #8211: Save/restore CFLAGS around AC_PROG_CC in
 configure.in, compiler optimizations are disabled when --with-pydebug is
 used.

---
 Misc/NEWS    | 3 +++
 configure    | 2 ++
 configure.in | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/Misc/NEWS b/Misc/NEWS
index 7987d8c494a..bebf2b7dfab 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.7 beta 1?
 Core and Builtins
 -----------------
 
+- Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, compiler
+  optimizations are disabled when --with-pydebug is used.
+
 - Issue #1583863: An unicode subclass can now override the __unicode__ method
 
 - Issue #6474: Make error message from passing an inadequate number of keyword
diff --git a/configure b/configure
index e6fc4d684a6..13e3d4883f5 100755
--- a/configure
+++ b/configure
@@ -2367,6 +2367,7 @@ echo "$as_me: error: cached CC is different -- throw away $cache_file
    { (exit 1); exit 1; }; }
 fi
 
+save_CFLAGS=$CFLAGS
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3286,6 +3287,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+CFLAGS=$save_CFLAGS
 
 
 
diff --git a/configure.in b/configure.in
index 9773e8c06f8..e9bd94b5adb 100644
--- a/configure.in
+++ b/configure.in
@@ -493,7 +493,9 @@ then
 (it is also a good idea to do 'make clean' before compiling)])
 fi
 
+save_CFLAGS=$CFLAGS
 AC_PROG_CC
+CFLAGS=$save_CFLAGS
 
 AC_SUBST(CXX)
 AC_SUBST(MAINCC)