Merged revisions 65652-65653 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65652 | ronald.oussoren | 2008-08-12 07:29:13 -0500 (Tue, 12 Aug 2008) | 2 lines

  Fix typo in the `arch` commandline
........
  r65653 | ronald.oussoren | 2008-08-12 07:41:45 -0500 (Tue, 12 Aug 2008) | 3 lines

  Another fix for 4-way universal builds, use the right #ifndef guard
  to detect the OSX 10.5 SDK.
........

diff --git a/configure b/configure
index 51fa04021e68126d6d9d2b958c8d3fa6968f8bab..91306318718b425cbcd073cbb7992b1036e484e4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 65034 .
+# From configure.in Revision: 65206 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.0.
 #
@@ -4601,7 +4601,7 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing_ok" >&6; }
 
                 elif test "$UNIVERSAL_ARCHS" = "all" ; then
                   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
-                  ARCH_RUN_32BIT="arch -386 -ppc"
+                  ARCH_RUN_32BIT="arch -i386 -ppc"
 
                 else
                   { { echo "$as_me:$LINENO: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&5

diff --git a/configure.in b/configure.in
index 870b8a9379ff09e32891da48f86f02dc1e4a641d..b8a457593e5d949aa2f2b52c4b4b77865730d89e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -871,7 +871,7 @@ yes)
 
                 elif test "$UNIVERSAL_ARCHS" = "all" ; then
                   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
-                  ARCH_RUN_32BIT="arch -386 -ppc"
+                  ARCH_RUN_32BIT="arch -i386 -ppc"
 
                 else
                   AC_MSG_ERROR([proper usage is --with-universalarch=32-bit|64-bit|all])