[Python-checkins] r79401 - in python/branches/py3k: Misc/NEWS configure configure.in

[victor.stinner]

Author: victor.stinner
Date: Thu Mar 25 02:02:29 2010
New Revision: 79401

Log:
Merged revisions 79392 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79392 | victor.stinner | 2010-03-25 01:21:53 +0100 (jeu., 25 mars 2010) | 3 lines
  
  Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, compiler
  optimizations are disabled when --with-pydebug is used.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/configure
   python/branches/py3k/configure.in

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu Mar 25 02:02:29 2010
@@ -12,6 +12,9 @@
 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 #8226: sys.setfilesystemencoding() raises a LookupError if the encoding
   is unknown
 

Modified: python/branches/py3k/configure
==============================================================================
--- python/branches/py3k/configure	(original)
+++ python/branches/py3k/configure	Thu Mar 25 02:02:29 2010
@@ -2302,6 +2302,7 @@
    { (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'
@@ -3221,6 +3222,7 @@
 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
 
 
 

Modified: python/branches/py3k/configure.in
==============================================================================
--- python/branches/py3k/configure.in	(original)
+++ python/branches/py3k/configure.in	Thu Mar 25 02:02:29 2010
@@ -441,7 +441,9 @@
 (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)