[Python-checkins] r78153 - in python/branches/release31-maint: configure configure.in

[ronald.oussoren]

Author: ronald.oussoren
Date: Thu Feb 11 14:24:45 2010
New Revision: 78153

Log:
Merged revisions 78152 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78152 | ronald.oussoren | 2010-02-11 14:23:08 +0100 (Thu, 11 Feb 2010) | 4 lines
  
  Fix for issue #7715: explicitly use the system arch instead of whatever is
  on the user's path. This is needed because GNU arch is not necessarily 
  compatible with Apple's version.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/configure
   python/branches/release31-maint/configure.in

Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure	(original)
+++ python/branches/release31-maint/configure	Thu Feb 11 14:24:45 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 78068 .
+# From configure.in Revision: 78074 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -4655,15 +4655,15 @@
 
 	         elif test "$UNIVERSAL_ARCHS" = "all" ; then
 		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
-		   ARCH_RUN_32BIT="arch -i386 -ppc"
+		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
 
 	         elif test "$UNIVERSAL_ARCHS" = "intel" ; then
 		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
-		   ARCH_RUN_32BIT="arch -i386"
+		   ARCH_RUN_32BIT="/usr/bin/arch -i386"
 
 	         elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
 		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
-		   ARCH_RUN_32BIT="arch -i386 -ppc"
+		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
 
 		 else
 	           { { echo "$as_me:$LINENO: error: proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" >&5

Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Thu Feb 11 14:24:45 2010
@@ -912,15 +912,15 @@
 
 	         elif test "$UNIVERSAL_ARCHS" = "all" ; then
 		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
-		   ARCH_RUN_32BIT="arch -i386 -ppc"
+		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
 
 	         elif test "$UNIVERSAL_ARCHS" = "intel" ; then
 		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
-		   ARCH_RUN_32BIT="arch -i386"
+		   ARCH_RUN_32BIT="/usr/bin/arch -i386"
 
 	         elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
 		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
-		   ARCH_RUN_32BIT="arch -i386 -ppc"
+		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
 
 		 else
 	           AC_MSG_ERROR([proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way])