Martin's change 43604 broke the Mac builds apparently due to an autoconf

bug.  I don't understand this at all, but Darwin/[78].* gets converted
to Darwin/78.* which is not correct.  Maybe I'm just clueless or overworked.
I can't see why in the original checkin this should have changed.

This hack gets the Mac build working again.  If someone figures out the
real problem, please revert this and fix for real.

Anthony is telling me that AC_PROG_CXX_WORKS which we use is broken.
I have no idea if that's related.

This change breaks up the case and fixes a typo.

diff --git a/configure b/configure
index bc59e81e288748cbc02285cafa8708c39f2415c1..205a75bb33bc11a5b4281954da0aae78ba637aa8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 43536 .
+# From configure.in Revision: 43604 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.5.
 #
@@ -1511,14 +1511,18 @@ 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.
-  # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
-  # has no effect, don't bother defineing them
-  Darwin/78.*)
+  Darwin/8.*)
     define_xopen_source=no
     ;;
-
 esac
 
 if test $define_xopen_source = yes

diff --git a/configure.in b/configure.in
index 12ac14919a88ceaa45a553fbcf5cb6cf36973ab6..4fb6cea765e2b86526b3288766c24e5edc1d3ca2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -171,14 +171,18 @@ 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.
-  # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE 
-  # has no effect, don't bother defineing them
-  Darwin/[78].*)
+  Darwin/8.*)
     define_xopen_source=no
     ;;
-
 esac
 
 if test $define_xopen_source = yes