[Python-checkins] r84367 - in python/branches/release31-maint: Misc/ACKS Misc/NEWS configure configure.in

[antoine.pitrou]

Author: antoine.pitrou
Date: Mon Aug 30 16:54:03 2010
New Revision: 84367

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/ACKS
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/configure
   python/branches/release31-maint/configure.in

Modified: python/branches/release31-maint/Misc/ACKS
==============================================================================
--- python/branches/release31-maint/Misc/ACKS	(original)
+++ python/branches/release31-maint/Misc/ACKS	Mon Aug 30 16:54:03 2010
@@ -673,6 +673,7 @@
 Sam Rushing
 Mark Russell
 Nick Russo
+Sébastien Sablé
 Hajime Saitou
 George Sakkis
 Rich Salz

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Mon Aug 30 16:54:03 2010
@@ -514,6 +514,9 @@
 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.

Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure	(original)
+++ python/branches/release31-maint/configure	Mon Aug 30 16:54:03 2010
@@ -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
 
 		       ;;
+      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 @@
 
 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
 

Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Mon Aug 30 16:54:03 2010
@@ -2233,6 +2233,9 @@
       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)