Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1:/tmp/cvs-serv3845 Modified Files: configure configure.in Log Message: Patch #798202: detect redhat9 Tcl/Tk in configure script. Will backport to 2.2. Index: configure =================================================================== RCS file: /cvsroot/python/python/dist/src/configure,v retrieving revision 1.419 retrieving revision 1.420 diff -C2 -d -r1.419 -r1.420 *** configure 4 Sep 2003 11:04:04 -0000 1.419 --- configure 4 Sep 2003 18:50:52 -0000 1.420 *************** *** 1,4 **** #! /bin/sh ! # From configure.in Revision: 1.429 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for python 2.4. --- 1,4 ---- #! /bin/sh ! # 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. *************** *** 17521,17524 **** --- 17521,17576 ---- 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 *************** *** 17534,17538 **** then # Without any arguments, Py_UNICODE defaults to two-byte mode ! enable_unicode="ucs2" fi --- 17586,17595 ---- then # Without any arguments, Py_UNICODE defaults to two-byte mode ! case "$have_ucs4_tcl" in ! yes) enable_unicode="ucs4" ! ;; ! *) enable_unicode="ucs2" ! ;; ! esac fi Index: configure.in =================================================================== RCS file: /cvsroot/python/python/dist/src/configure.in,v retrieving revision 1.430 retrieving revision 1.431 diff -C2 -d -r1.430 -r1.431 *** configure.in 4 Sep 2003 11:04:04 -0000 1.430 --- configure.in 4 Sep 2003 18:50:54 -0000 1.431 *************** *** 2648,2651 **** --- 2648,2663 ---- 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 *************** *** 2658,2662 **** then # Without any arguments, Py_UNICODE defaults to two-byte mode ! enable_unicode="ucs2" fi --- 2670,2679 ---- then # Without any arguments, Py_UNICODE defaults to two-byte mode ! case "$have_ucs4_tcl" in ! yes) enable_unicode="ucs4" ! ;; ! *) enable_unicode="ucs2" ! ;; ! esac fi