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 23b9d6c7600b53809a5ca7c6f93bc9f506e31d9f..16411b259271f9bf47ec301c3abd98d791fb543b 100755 (executable)
--- 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 @@ Optional Packages:
   --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 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing_ok" >&6; }
                   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 @@ echo "$as_me: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&2
                                    # 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 @@ case $ac_sys_system/$ac_sys_release in
             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 @@ _ACEOF
 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 @@ cat >>conftest.$ac_ext <<_ACEOF
       } else {
          return 1;
       }
-    ]
+    }
+
 _ACEOF
 rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"

diff --git a/configure.in b/configure.in
index b7b6a986ebe881d0916058fb111c223ed41c9e52..392ac0d44db998b691fdf43ccf841fd5bac44bbf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -106,7 +106,7 @@ AC_SUBST(ARCH_RUN_32BIT)
 UNIVERSAL_ARCHS="32-bit"
 AC_MSG_CHECKING(for --with-universal-archs)
 AC_ARG_WITH(universal-archs,
-    AC_HELP_STRING(--with-universal-archs=ARCH, select architectures for universal build ("32-bit", "64-bit" or "all")),
+    AC_HELP_STRING(--with-universal-archs=ARCH, select architectures for universal build ("32-bit", "64-bit", "3-way", "intel" or "all")),
 [
        AC_MSG_RESULT($withval)
        UNIVERSAL_ARCHS="$withval"
@@ -916,6 +916,14 @@ yes)
                   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
                   AC_MSG_ERROR([proper usage is --with-universalarch=32-bit|64-bit|all])
 
@@ -941,6 +949,15 @@ yes)
                                    # 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
@@ -1519,7 +1536,7 @@ case $ac_sys_system/$ac_sys_release in
         else 
             LIBTOOL_CRUFT=""
     fi
-    AC_TRY_RUN([[
+    AC_TRY_RUN([
     #include <unistd.h>
     int main(int argc, char*argv[])
     {
@@ -1528,9 +1545,10 @@ case $ac_sys_system/$ac_sys_release in
       } else {
          return 1;
       }
-    ]], ac_osx_32bit=yes,
+    }
+    ], ac_osx_32bit=yes,
        ac_osx_32bit=no,
-       ac_osx_32bit=no)
+       ac_osx_32bit=yes)
     
     if test "${ac_osx_32bit}" = "yes"; then
        case `arch` in