Merged revisions 80665 via svnmerge from
svn+pythonssh://pythondev@svn.python.org/python/trunk
........
r80665 | marc-andre.lemburg | 2010-04-30 19:20:14 +0200 (Fri, 30 Apr 2010) | 7 lines
[issue8211] configure: ignore AC_PROG_CC hardcoded CFLAGS
Only override the AC_PROG_CC determined CFLAGS if they were set by the user.
This restores the default behavior in the common case of not having CFLAGS
defined when running configure.
........
diff --git a/configure b/configure
index a4287bc..7afe2c8 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 80576 .
+# From configure.in Revision: 80648 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 3.2.
#
@@ -3176,7 +3176,9 @@
(it is also a good idea to do 'make clean' before compiling)" "$LINENO" 5
fi
-save_CFLAGS=$CFLAGS
+# If the user set CFLAGS, use this instead of the automatically
+# determined setting
+preset_cflags="$CFLAGS"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3968,7 +3970,10 @@
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
+if test ! -z "$preset_cflags"
+then
+ CFLAGS=$preset_cflags
+fi