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 5cd1e3dd3b53add8eedc9c1ddcba6978a4e27cfb..dfbbc81e133929cd37855fc384978e6d529fe0fd 100644 (file)
--- 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 44644111f34fe880303c389f7179f507c58a1149..e8f428355506514900b2bd69a4a6793a7f5a684d 100644 (file)
--- 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 d7cffff8af8c72dfe9e4802dd067ece4e23b45e8..50a44edd9e4cf5429b6402572a5ea6a6311d3326 100755 (executable)
--- 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 0520ea4444fabc263d0e79382ba6bc87bb5fad6e..557be3ae9d465d870c637cbb535ccb82946fd9dd 100644 (file)
--- 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)