From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 20 Sep 2009 20:16:38 +0000 (+0000)
Subject: Merged revisions 74978 via svnmerge from
X-Git-Tag: v2.6.3rc1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba0aa6b544f6fa58495cd81e34f21112aa26616d;p=python

Merged revisions 74978 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74978 | ronald.oussoren | 2009-09-20 22:05:44 +0200 (Sun, 20 Sep 2009) | 2 lines

  Fix typo in error message
........
---

diff --git a/configure b/configure
index 3cb56901fd..f58fde44b6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 74681 .
+# From configure.in Revision: 74712 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.6.
 #
@@ -4675,8 +4675,8 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing_ok" >&6; }
 		   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;}
+	           { { echo "$as_me:$LINENO: error: proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" >&5
+echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" >&2;}
    { (exit 1); exit 1; }; }
 
 		 fi
diff --git a/configure.in b/configure.in
index 9ad9f758e5..277edc7b6b 100644
--- a/configure.in
+++ b/configure.in
@@ -935,7 +935,7 @@ yes)
 		   ARCH_RUN_32BIT="arch -i386 -ppc"
 
 		 else
-	           AC_MSG_ERROR([proper usage is --with-universalarch=32-bit|64-bit|all])
+	           AC_MSG_ERROR([proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way])
 
 		 fi