From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Feb 2010 00:18:52 +0000 (+0000)
Subject: Merged revisions 78469 via svnmerge from
X-Git-Tag: v3.1.2rc1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d13bb8926d8d7dd02818716e88de5581b49e1e5;p=python

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

diff --git a/configure.in b/configure.in
index f5d03427f7..1add723b59 100644
--- a/configure.in
+++ b/configure.in
@@ -3529,6 +3529,7 @@ AH_TEMPLATE(Py_UNICODE_SIZE,
 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,