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

Thu Feb 11 14:40:07 CET 2010

Author: ronald.oussoren
Date: Thu Feb 11 14:40:06 2010
New Revision: 78157
Log:
Merged revisions 78156 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r78156 | ronald.oussoren | 2010年02月11日 14:38:58 +0100 (2010年2月11日) | 9 lines
 
 Merged revisions 78154 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r78154 | ronald.oussoren | 2010年02月11日 14:26:54 +0100 (2010年2月11日) | 2 lines
 
 Finish fix for issue 7715, after explicit search for calls to `arch`
 ........
................
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:40:06 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 78074 .
+# From configure.in Revision: 78153 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -4703,7 +4703,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.
@@ -13292,7 +13292,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)';;
@@ -13360,7 +13360,7 @@
 
 
 if test "${ac_osx_32bit}" = "yes"; then
- 	case `arch` in
+ 	case `/usr/bin/arch` in
 	i386)
 		MACOSX_DEFAULT_ARCH="i386"
 		;;
@@ -13374,7 +13374,7 @@
 		;;
 	esac
 else
- 	case `arch` in
+ 	case `/usr/bin/arch` in
 	i386)
 		MACOSX_DEFAULT_ARCH="x86_64"
 		;;
Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Thu Feb 11 14:40:06 2010
@@ -958,7 +958,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.
@@ -1526,7 +1526,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)';;
@@ -1553,7 +1553,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" 
 		;;
@@ -1565,7 +1565,7 @@
 		;;
 	esac
 else
- 	case `arch` in
+ 	case `/usr/bin/arch` in
 	i386) 
 		MACOSX_DEFAULT_ARCH="x86_64" 
 		;;
