From 48fd2a6a738ef05465576cd1ffe776ab5928f3b2 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 30 Aug 2010 14:54:03 +0000
Subject: [PATCH] Merged revisions 84366 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r84366 | antoine.pitrou | 2010-08-30 16:52:00 +0200 (lun., 30 août 2010) | 5 lines

  Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x.  Patch by
  Sébastien Sablé.
........
---
 Misc/ACKS    |  1 +
 Misc/NEWS    |  3 +++
 configure    | 10 +++++++---
 configure.in |  3 +++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Misc/ACKS b/Misc/ACKS
index 5cd1e3dd3b5..dfbbc81e133 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -673,6 +673,7 @@ Jeff Rush
 Sam Rushing
 Mark Russell
 Nick Russo
+Sébastien Sablé
 Hajime Saitou
 George Sakkis
 Rich Salz
diff --git a/Misc/NEWS b/Misc/NEWS
index 44644111f34..e8f42835550 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -514,6 +514,9 @@ Extension Modules
 Build
 -----
 
+- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x.  Patch by
+  Sébastien Sablé.
+
 - Issue #3928: os.mknod() now available in Solaris, also.
 
 - Issue #6716: Quote -x arguments of compileall in MSI installer.
diff --git a/configure b/configure
index d7cffff8af8..50a44edd9e4 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 80702 .
+# From configure.in Revision: 82963 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 3.1.
 #
@@ -8638,6 +8638,10 @@ $as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
 $as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
 
 		       ;;
+      AIX/6)
+$as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
+
+                      ;;
       esac
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5
@@ -13847,8 +13851,8 @@ esac
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
+config_files="`echo $ac_config_files`"
+config_headers="`echo $ac_config_headers`"
 
 _ACEOF
 
diff --git a/configure.in b/configure.in
index 0520ea4444f..557be3ae9d4 100644
--- a/configure.in
+++ b/configure.in
@@ -2233,6 +2233,9 @@ if test "$posix_threads" = "yes"; then
       AIX/5) AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
 		       Define if the Posix semaphores do not work on your system)
 		       ;;
+      AIX/6) AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
+                      Define if the Posix semaphores do not work on your system)
+                      ;;
       esac
 
       AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported)