diff options
author | Georg Brandl <georg@python.org> | 2011-02-25 10:22:44 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2011-02-25 10:22:44 (GMT) |
commit | 3f0df3bc51a9d06a464731bbc9e70fcd21734505 (patch) | |
tree | f6c9c4308697e5c6ffd85b8718027546eb03f132 | |
parent | 6baf117d88f03e11c74d576c75268604377d2715 (diff) | |
download | cpython-3f0df3bc51a9d06a464731bbc9e70fcd21734505.zip cpython-3f0df3bc51a9d06a464731bbc9e70fcd21734505.tar.gz cpython-3f0df3bc51a9d06a464731bbc9e70fcd21734505.tar.bz2 |
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.
........
-rw-r--r-- | Python/dynload_aix.c | 2 | ||||
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | configure.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Python/dynload_aix.c b/Python/dynload_aix.c index 8d56d7d..149990d 100644 --- 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 @@ -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 85ce6fa..a24e54b 100644 --- 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 |