[Python-checkins] r74982 - in python/branches/release26-maint: configure configure.in

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Sep 20 22:16:38 2009
New Revision: 74982

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/configure
   python/branches/release26-maint/configure.in

Modified: python/branches/release26-maint/configure
==============================================================================
--- python/branches/release26-maint/configure	(original)
+++ python/branches/release26-maint/configure	Sun Sep 20 22:16:38 2009
@@ -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 @@
 		   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

Modified: python/branches/release26-maint/configure.in
==============================================================================
--- python/branches/release26-maint/configure.in	(original)
+++ python/branches/release26-maint/configure.in	Sun Sep 20 22:16:38 2009
@@ -935,7 +935,7 @@
 		   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