Merged revisions 84946 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84946 | antoine.pitrou | 2010-09-21 17:19:14 +0200 (mar., 21 sept. 2010) | 4 lines

  Issue #1633863: Don't ignore $CC under AIX.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 22cffdcc3c3b65c501194a166a0113737e0272ee..a437351776212416d75590e549a07b97e93bd9b8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -565,6 +565,8 @@ Extension Modules
 Build
 -----
 
+- Issue #1633863: Don't ignore $CC under AIX.
+
 - Issue #9810: Compile bzip2 source files in python's project file
   directly. It used to be built with bzip2's makefile.
 

diff --git a/configure b/configure
index 7313145ed1dcce741c68e0ff3495d03bd63b7d3f..4a2f352e9c07815f00b345f386ad0bf2ae29331a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 84675 .
+# From configure.in Revision: 84682 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 3.1.
 #
@@ -3131,7 +3131,7 @@ if test "${with_gcc+set}" = set; then :
 else
 
        case $ac_sys_system in
-       AIX*)   CC=cc_r
+       AIX*)   CC=${CC:-xlc_r}
                without_gcc=;;
        *)      without_gcc=no;;
        esac

diff --git a/configure.in b/configure.in
index 73ab4a4fbe507b3247908a5b92f9d25aa67cfc04..0cd5514e1707b7a25fa5dc37646a47d0892a9b2d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -435,7 +435,7 @@ AC_ARG_WITH(gcc,
                without_gcc=$withval;;
        esac], [
        case $ac_sys_system in
-       AIX*)   CC=cc_r
+       AIX*)   CC=${CC:-xlc_r}
                without_gcc=;;
        *)      without_gcc=no;;
        esac])