From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 4 Apr 2006 06:03:50 +0000 (+0000)
Subject: Revert 43615, fixing it properly through quadrigraphs.
X-Git-Tag: v2.5a1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a058836e969eba03142bc8f01418a28741f70dc3;p=python

Revert 43615, fixing it properly through quadrigraphs.
Apparently, the code in #1416559 was not generated
through invoking autoconf.
---

diff --git a/configure b/configure
index 205a75bb33..e65c85b4ee 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 43604 .
+# From configure.in Revision: 43615 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.5.
 #
@@ -1511,18 +1511,14 @@ case $ac_sys_system/$ac_sys_release in
       define_xopen_source=no
     fi
     ;;
-  # XXX(nnorwitz): the 2 cases below should be Darwin/[78].*,
-  # but autoconf seems to convert that to Darwin/78.* which is incorrect.
-  # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
-  # has no effect, don't bother defining them.
-  Darwin/7.*)
-    define_xopen_source=no
-    ;;
   # On Mac OS X 10.4, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
   # disables platform specific features beyond repair.
-  Darwin/8.*)
+  # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
+  # has no effect, don't bother defineing them
+  Darwin/[78].*)
     define_xopen_source=no
     ;;
+
 esac
 
 if test $define_xopen_source = yes
diff --git a/configure.in b/configure.in
index 4fb6cea765..2f4df3f212 100644
--- a/configure.in
+++ b/configure.in
@@ -171,18 +171,14 @@ case $ac_sys_system/$ac_sys_release in
       define_xopen_source=no
     fi
     ;;
-  # XXX(nnorwitz): the 2 cases below should be Darwin/[78].*, 
-  # but autoconf seems to convert that to Darwin/78.* which is incorrect.
-  # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE 
-  # has no effect, don't bother defining them.
-  Darwin/7.*)
-    define_xopen_source=no
-    ;;
   # On Mac OS X 10.4, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
   # disables platform specific features beyond repair.
-  Darwin/8.*)
+  # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE 
+  # has no effect, don't bother defineing them
+  Darwin/@<:@78@:>@.*)
     define_xopen_source=no
     ;;
+
 esac
 
 if test $define_xopen_source = yes