[Python-checkins] r84947 - in python/branches/release31-maint: Misc/NEWS configure configure.in

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Sep 21 17:23:10 2010
New Revision: 84947

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/configure
   python/branches/release31-maint/configure.in

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Sep 21 17:23:10 2010
@@ -565,6 +565,8 @@
 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.
 

Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure	(original)
+++ python/branches/release31-maint/configure	Tue Sep 21 17:23:10 2010
@@ -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 @@
 else
 
 	case $ac_sys_system in
-	AIX*)   CC=cc_r
+	AIX*)   CC=${CC:-xlc_r}
 		without_gcc=;;
 	*)	without_gcc=no;;
 	esac

Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Tue Sep 21 17:23:10 2010
@@ -435,7 +435,7 @@
 		without_gcc=$withval;;
 	esac], [
 	case $ac_sys_system in
-	AIX*)   CC=cc_r
+	AIX*)   CC=${CC:-xlc_r}
 		without_gcc=;;
 	*)	without_gcc=no;;
 	esac])