[Python-checkins] r78154 - in python/trunk: configure configure.in

[ronald.oussoren]

Author: ronald.oussoren
Date: Thu Feb 11 14:26:54 2010
New Revision: 78154

Log:
Finish fix for issue 7715, after explicit search for calls to `arch`


Modified:
   python/trunk/configure
   python/trunk/configure.in

Modified: python/trunk/configure
==============================================================================
--- python/trunk/configure	(original)
+++ python/trunk/configure	Thu Feb 11 14:26:54 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 77588 .
+# From configure.in Revision: 78150 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -4748,7 +4748,7 @@
 				    cur_target='10.5'
 			    fi
 		    else
-			    if test `arch` = "i386"; then
+			    if test `/usr/bin/arch` = "i386"; then
 				    # On Intel macs default to a deployment
 				    # target of 10.4, that's the first OSX
 				    # release with Intel support.
@@ -14579,7 +14579,7 @@
     if test "${enable_universalsdk}"; then
 	    :
     else
-        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
+        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
     fi
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@@ -14647,7 +14647,7 @@
 
 
     if test "${ac_osx_32bit}" = "yes"; then
-    	case `arch` in
+    	case `/usr/bin/arch` in
     	i386)
     		MACOSX_DEFAULT_ARCH="i386"
     		;;
@@ -14661,7 +14661,7 @@
     		;;
     	esac
     else
-    	case `arch` in
+    	case `/usr/bin/arch` in
     	i386)
     		MACOSX_DEFAULT_ARCH="x86_64"
     		;;

Modified: python/trunk/configure.in
==============================================================================
--- python/trunk/configure.in	(original)
+++ python/trunk/configure.in	Thu Feb 11 14:26:54 2010
@@ -991,7 +991,7 @@
 				    cur_target='10.5'
 			    fi
 		    else
-			    if test `arch` = "i386"; then
+			    if test `/usr/bin/arch` = "i386"; then
 				    # On Intel macs default to a deployment
 				    # target of 10.4, that's the first OSX
 				    # release with Intel support.
@@ -1615,7 +1615,7 @@
     if test "${enable_universalsdk}"; then
 	    :
     else
-        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
+        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
     fi
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@@ -1642,7 +1642,7 @@
        ac_osx_32bit=yes)
     
     if test "${ac_osx_32bit}" = "yes"; then
-    	case `arch` in
+    	case `/usr/bin/arch` in
     	i386) 
     		MACOSX_DEFAULT_ARCH="i386" 
     		;;
@@ -1654,7 +1654,7 @@
     		;;
     	esac
     else
-    	case `arch` in
+    	case `/usr/bin/arch` in
     	i386) 
     		MACOSX_DEFAULT_ARCH="x86_64" 
     		;;