[Python-checkins] r88561 - in python/branches/release31-maint: Python/dynload_aix.c configure configure.in

[georg.brandl]

Author: georg.brandl
Date: Fri Feb 25 11:22:44 2011
New Revision: 88561

Log:
Merged revisions 88430 via svnmerge from 
svn+ssh://svn.python.org/python/branches/py3k

........
  r88430 | georg.brandl | 2011-02-15 20:48:59 +0100 (Di, 15 Feb 2011) | 1 line
  
  #730467: Another small AIX fix.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Python/dynload_aix.c
   python/branches/release31-maint/configure
   python/branches/release31-maint/configure.in

Modified: python/branches/release31-maint/Python/dynload_aix.c
==============================================================================
--- python/branches/release31-maint/Python/dynload_aix.c	(original)
+++ python/branches/release31-maint/Python/dynload_aix.c	Fri Feb 25 11:22:44 2011
@@ -12,7 +12,7 @@
 
 
 #ifdef AIX_GENUINE_CPLUSPLUS
-#include "/usr/lpp/xlC/include/load.h"
+#include <load.h>
 #define aix_load loadAndInit
 #else
 #define aix_load load

Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure	(original)
+++ python/branches/release31-maint/configure	Fri Feb 25 11:22:44 2011
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 87699 .
+# From configure.in Revision: 88560 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for python 3.1.
 #
@@ -7914,7 +7914,7 @@
 $as_echo_n "checking for genuine AIX C++ extensions support... " >&6; }
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include "/usr/lpp/xlC/include/load.h"
+#include <load.h>
 int
 main ()
 {

Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Fri Feb 25 11:22:44 2011
@@ -1969,7 +1969,7 @@
 # checks for system dependent C++ extensions support
 case "$ac_sys_system" in
 	AIX*)	AC_MSG_CHECKING(for genuine AIX C++ extensions support)
-		AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"],
+		AC_TRY_LINK([#include <load.h>],
 			    [loadAndInit("", 0, "")],
 			    [AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1,
                       [Define for AIX if your compiler is a genuine IBM xlC/xlC_r