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
........

configure

 #! /bin/sh
-# From configure.in Revision: 74669 .
+# From configure.in Revision: 74682 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.2.
 #
@@ -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
@@ -4659,6 +4659,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;}
@@ -4686,6 +4694,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
@@ -14419,7 +14436,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.  */
@@ -14427,7 +14444,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[])
     {
@@ -14436,7 +14453,8 @@ cat >>conftest.$ac_ext <<_ACEOF
       } else {
       	  return 1;
       }
-    ]
+    }
+
 _ACEOF
 rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"

configure.in

@@ -114,7 +114,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"
@@ -925,6 +925,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])
 
@@ -950,6 +958,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
@@ -1486,7 +1503,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[])
     {
@@ -1495,9 +1512,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