Merged revisions 74713 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r74713 | ronald.oussoren | 2009-09-08 09:12:42 +0200 (Tue, 08 Sep 2009) | 9 lines
Merged revisions 74701 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74701 | ronald.oussoren | 2009-09-07 08:12:00 +0200 (Mon, 07 Sep 2009) | 2 lines
Fix typo in configure.in
........
................
diff --git a/configure b/configure
index 23b9d6c..16411b2 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 73307 .
+# From configure.in Revision: 74683 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.1.
#
@@ -1330,7 +1330,7 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-universal-archs=ARCH
select architectures for universal build ("32-bit",
- "64-bit" or "all")
+ "64-bit", "3-way", "intel" or "all")
--with-framework-name=FRAMEWORK
specify an alternate name of the framework built
with --enable-framework
@@ -4654,6 +4654,14 @@
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
ARCH_RUN_32BIT="arch -i386 -ppc"
+ elif test "$UNIVERSAL_ARCHS" = "intel" ; then
+ UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
+ ARCH_RUN_32BIT="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"
+
else
{ { echo "$as_me:$LINENO: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&5
echo "$as_me: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&2;}
@@ -4681,6 +4689,15 @@
# that's the first OS release where
# 4-way builds make sense.
cur_target='10.5'
+
+ elif test "${UNIVERSAL_ARCHS}" = "3-way"; then
+ cur_target='10.5'
+
+ elif test "${UNIVERSAL_ARCHS}" = "intel"; then
+ cur_target='10.5'
+
+ elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
+ cur_target='10.5'
fi
else
if test `arch` = "i386"; then
@@ -13280,7 +13297,7 @@
LIBTOOL_CRUFT=""
fi
if test "$cross_compiling" = yes; then
- ac_osx_32bit=no
+ ac_osx_32bit=yes
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -13288,7 +13305,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-[
+
#include <unistd.h>
int main(int argc, char*argv[])
{
@@ -13297,7 +13314,8 @@
} else {
return 1;
}
- ]
+ }
+
_ACEOF
rm -f conftest$ac_exeext
if { (ac_try="$ac_link"