[Python-checkins] r78474 - in python/branches/release31-maint: configure.in

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Feb 27 01:18:52 2010
New Revision: 78474

Log:
Merged revisions 78469 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78469 | benjamin.peterson | 2010-02-26 18:13:52 -0600 (Fri, 26 Feb 2010) | 9 lines
  
  Merged revisions 78467 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r78467 | ezio.melotti | 2010-02-26 18:05:42 -0600 (Fri, 26 Feb 2010) | 1 line
    
    Show an error when the value passed to --enable-unicode is not ucs2 or ucs4 (lowercase).
  ........
................


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

Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Sat Feb 27 01:18:52 2010
@@ -3529,6 +3529,7 @@
 case "$unicode_size" in
   4) AC_DEFINE(Py_UNICODE_SIZE, 4) ;;
   *) AC_DEFINE(Py_UNICODE_SIZE, 2) ;;
+*) AC_MSG_ERROR([invalid value for --enable-unicode. Use either ucs2 or ucs4 (lowercase).]) ;;
 esac
 
 AH_TEMPLATE(PY_UNICODE_TYPE,