diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2003-09-04 18:50:54 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2003-09-04 18:50:54 (GMT) |
| commit | fa3bdea018c511dbfabec8c2860b36523448b217 (patch) | |
| tree | cf192498eb13ee18d76a7b2d43ef148285059369 /configure.in | |
| parent | e81e9b1d3be5c2197235e3dc130c41f18a42edf7 (diff) | |
| download | cpython-fa3bdea018c511dbfabec8c2860b36523448b217.zip cpython-fa3bdea018c511dbfabec8c2860b36523448b217.tar.gz cpython-fa3bdea018c511dbfabec8c2860b36523448b217.tar.bz2 | |
Patch #798202: detect redhat9 Tcl/Tk in configure script.
Will backport to 2.2.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 44da831..70e1ff9 100644 --- a/configure.in +++ b/configure.in @@ -2647,6 +2647,18 @@ then AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>]) fi +AC_MSG_CHECKING(for UCS-4 tcl) +have_ucs4_tcl=no +AC_TRY_COMPILE([ +#include <tcl.h> +#if TCL_UTF_MAX != 6 +# error "NOT UCS4_TCL" +#endif], [], [ + AC_DEFINE(HAVE_UCS4_TCL, 1, [Define this if you have tcl and TCL_UTF_MAX==6]) + have_ucs4_tcl=yes +]) +AC_MSG_RESULT($have_ucs4_tcl) + AC_MSG_CHECKING(what type to use for unicode) dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output AC_ARG_ENABLE(unicode, @@ -2657,7 +2669,12 @@ AC_ARG_ENABLE(unicode, if test $enable_unicode = yes then # Without any arguments, Py_UNICODE defaults to two-byte mode - enable_unicode="ucs2" + case "$have_ucs4_tcl" in + yes) enable_unicode="ucs4" + ;; + *) enable_unicode="ucs2" + ;; + esac fi AH_TEMPLATE(Py_UNICODE_SIZE, |