[Python-3000-checkins] r65857 - in python/branches/py3k: configure configure.in

[benjamin.peterson]

Author: benjamin.peterson
Date: Tue Aug 19 19:16:56 2008
New Revision: 65857

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/configure
   python/branches/py3k/configure.in

Modified: python/branches/py3k/configure
==============================================================================
--- python/branches/py3k/configure	(original)
+++ python/branches/py3k/configure	Tue Aug 19 19:16:56 2008
@@ -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 @@
 
 	         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

Modified: python/branches/py3k/configure.in
==============================================================================
--- python/branches/py3k/configure.in	(original)
+++ python/branches/py3k/configure.in	Tue Aug 19 19:16:56 2008
@@ -871,7 +871,7 @@
 
 	         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])