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

diff --git a/configure b/configure
index cbce7424c783c1d469f59c68b15e597defddc824..70d5cb565e290d7604d891ac377f500b80dd4112 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 @@ _ACEOF
   # 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

diff --git a/configure.in b/configure.in
index 5889d68f495ee404ebc984dd256f9cf7db301a0e..219e9256f812df60eed3927ebfd1c779fc4aa4a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -322,7 +322,7 @@ case $ac_sys_system/$ac_sys_release in
   # 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