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 3cb56901fd03325cbaabbf32d114f297d19b6096..f58fde44b6cb950b4c03c61f241278d6a3df7bbb 100755 (executable)
--- 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 9ad9f758e586f13e915557f37f55ee29a00e5400..277edc7b6b8d9e247e8afe230bb6a755f67c8bc6 100644 (file)
--- 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