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

diff --git a/Python/dynload_aix.c b/Python/dynload_aix.c
index 8d56d7d00890946404945c2c684cf7743f9d506a..149990d799507f99a65663947b013abf3183e163 100644 (file)
--- a/Python/dynload_aix.c
+++ b/Python/dynload_aix.c
@@ -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

diff --git a/configure b/configure
index 5985220f1ace673b85ca4f19c60f27b47bffc576..90efcea471597bb97928def9ddce2b37596df251 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 @@ case "$ac_sys_system" in
 $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 ()
 {

diff --git a/configure.in b/configure.in
index 85ce6fa900cf90e92d1b9a27411a2bf268abc9c8..a24e54b36df758ae99d504aba979d064da3734c1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1969,7 +1969,7 @@ AC_CHECK_LIB(intl, textdomain,
 # 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