traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch #798202: detect redhat9 Tcl/Tk in configure script. 

Will backport to 2.2.
This commit is contained in:
Martin v. Löwis 2003-09-04 18:50:54 +00:00
parent e81e9b1d3b
commit fa3bdea018
2 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.429 . # From configure.in Revision: 1.430 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for python 2.4. # Generated by GNU Autoconf 2.57 for python 2.4.
# #
@ -17520,6 +17520,58 @@ _ACEOF
fi 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 "$as_me:$LINENO: checking what type to use for unicode" >&5
echo $ECHO_N "checking what type to use for unicode... $ECHO_C" >&6 echo $ECHO_N "checking what type to use for unicode... $ECHO_C" >&6
# Check whether --enable-unicode or --disable-unicode was given. # Check whether --enable-unicode or --disable-unicode was given.
@ -17533,7 +17585,12 @@ fi;
if test $enable_unicode = yes if test $enable_unicode = yes
then then
# Without any arguments, Py_UNICODE defaults to two-byte mode # 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 fi

19
configure.in
View File

@ -2647,6 +2647,18 @@ then
AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>]) AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>])
fi 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) AC_MSG_CHECKING(what type to use for unicode)
dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
AC_ARG_ENABLE(unicode, AC_ARG_ENABLE(unicode,
@ -2657,7 +2669,12 @@ AC_ARG_ENABLE(unicode,
if test $enable_unicode = yes if test $enable_unicode = yes
then then
# Without any arguments, Py_UNICODE defaults to two-byte mode # 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 fi
AH_TEMPLATE(Py_UNICODE_SIZE, AH_TEMPLATE(Py_UNICODE_SIZE,