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 (Thu, 11 Feb 2010) | 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 (Thu, 11 Feb 2010) | 2 lines

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

diff --git a/configure b/configure
index 4aec9aab2d93ea56dc8abcc1f104a7379f255062..7aae1257be36b8c65e78d57fae01c64c1b78261d 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int
                                    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 @@ case $ac_sys_system/$ac_sys_release in
     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 @@ fi
 
 
     if test "${ac_osx_32bit}" = "yes"; then
-       case `arch` in
+       case `/usr/bin/arch` in
        i386)
                MACOSX_DEFAULT_ARCH="i386"
                ;;
@@ -13374,7 +13374,7 @@ echo "$as_me: error: Unexpected output of 'arch' on OSX" >&2;}
                ;;
        esac
     else
-       case `arch` in
+       case `/usr/bin/arch` in
        i386)
                MACOSX_DEFAULT_ARCH="x86_64"
                ;;

diff --git a/configure.in b/configure.in
index 85c065f2bd30a0aa5a34fb05045f557dbad58657..0022d023d8ebe337b5406ee39f3815824ff9a27a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -958,7 +958,7 @@ yes)
                                    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 @@ case $ac_sys_system/$ac_sys_release in
     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 @@ case $ac_sys_system/$ac_sys_release in
        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 @@ case $ac_sys_system/$ac_sys_release in
                ;;
        esac
     else
-       case `arch` in
+       case `/usr/bin/arch` in
        i386) 
                MACOSX_DEFAULT_ARCH="x86_64" 
                ;;