[Python-checkins] r78809 - in python/branches/release31-maint: configure configure.in

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue Mar  9 07:41:58 2010
New Revision: 78809

Log:
Merged revisions 78808 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78808 | ronald.oussoren | 2010-03-09 07:40:19 +0100 (Tue, 09 Mar 2010) | 2 lines
  
  Bugfix for the fix for issue 8067
........


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

Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure	(original)
+++ python/branches/release31-maint/configure	Tue Mar  9 07:41:58 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 78477 .
+# From configure.in Revision: 78783 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -2160,7 +2160,7 @@
   # has no effect, don't bother defining them
   Darwin/[6789].*)
     define_xopen_source=no;;
-  Darwin/1[6789].*)
+  Darwin/1[0-9].*)
     define_xopen_source=no;;
   # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
   # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined

Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Tue Mar  9 07:41:58 2010
@@ -322,7 +322,7 @@
   # has no effect, don't bother defining them
   Darwin/@<:@6789@:>@.*)
     define_xopen_source=no;;
-  Darwin/1@<:@6789@:>@.*)
+  Darwin/1@<:@0-9@:>@.*)
     define_xopen_source=no;;
   # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
   # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined