Merged revisions 84366 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

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

diff --git a/Misc/ACKS b/Misc/ACKS
index f65df52134d19825a43ffd8211e7713aee3df9e8..293188c178712370973b5cb11cfd2db74ce7949b 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -682,6 +682,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 fe04f432c55d7b5a90dffe9158303bc24ea5b584..1fa15224e2f7867e58cad33b1d7a718997c52639 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -523,6 +523,9 @@ Tests
 Build
 -----
 
+- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x.  Patch by
+  Sébastien Sablé.
+
 - Display installer warning that Windows 2000 won't be supported in future
   releases.
 

diff --git a/configure b/configure
index 8f53afec8065a8bc1206db18beb33c4232b0d30c..5f4e6d1384aef91b6201187326055df20ea43968 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 81509 .
+# From configure.in Revision: 81582 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 2.7.
 #
@@ -8926,6 +8926,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
@@ -14219,8 +14223,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 13fbbede68d04cc4f169c3941438951ae2c9e370..cbcbbf019c456dd6a37a122d0fdb4cbea9833958 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2343,6 +2343,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)