summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2003-09-04 18:50:54 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2003-09-04 18:50:54 (GMT)
commitfa3bdea018c511dbfabec8c2860b36523448b217 (patch)
treecf192498eb13ee18d76a7b2d43ef148285059369 /configure
parente81e9b1d3be5c2197235e3dc130c41f18a42edf7 (diff)
downloadcpython-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')
-rwxr-xr-xconfigure61
1 files changed, 59 insertions, 2 deletions
diff --git a/configure b/configure
index 0f74a29..3e280b3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.429 .
+# From configure.in Revision: 1.430 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for python 2.4.
#
@@ -17520,6 +17520,58 @@ _ACEOF
fi
+echo "$as_me:$LINENO: checking for UCS-4 tcl" >&5
+echo $ECHO_N "checking for UCS-4 tcl... $ECHO_C" >&6
+have_ucs4_tcl=no
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <tcl.h>
+#if TCL_UTF_MAX != 6
+# error "NOT UCS4_TCL"
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UCS4_TCL 1
+_ACEOF
+
+ have_ucs4_tcl=yes
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $have_ucs4_tcl" >&5
+echo "${ECHO_T}$have_ucs4_tcl" >&6
+
echo "$as_me:$LINENO: checking what type to use for unicode" >&5
echo $ECHO_N "checking what type to use for unicode... $ECHO_C" >&6
# Check whether --enable-unicode or --disable-unicode was given.
@@ -17533,7 +17585,12 @@ fi;
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