[Python-checkins] python/dist/src configure, 1.423, 1.424 configure.in, 1.434, 1.435

Mon Sep 22 07:14:43 EDT 2003

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31028
Modified Files:
	configure configure.in 
Log Message:
Added test whether wchar_t is signed or not. A signed wchar_t is not usable as internal unicode type base for Py_UNICODE since the unicode implementation assumes an unsigned type.
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.423
retrieving revision 1.424
diff -C2 -d -r1.423 -r1.424
*** configure	20 Sep 2003 15:30:18 -0000	1.423
--- configure	22 Sep 2003 11:14:38 -0000	1.424
***************
*** 1,6 ****
 #! /bin/sh
! # From configure.in Revision: 1.433 .
 # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57 for python 2.4.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--- 1,6 ----
 #! /bin/sh
! # From configure.in Revision: 1.434 .
 # Guess values for system-dependent variables and create Makefiles.
[...13654 lines suppressed...]
 
 rm -f $ac_file
***************
*** 19898,19906 ****
 if test "$no_create" != yes; then
 ac_cs_success=:
- ac_config_status_args=
- test "$silent" = yes &&
- ac_config_status_args="$ac_config_status_args --quiet"
 exec 5>/dev/null
! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
 exec 5>>config.log
 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
--- 19121,19126 ----
 if test "$no_create" != yes; then
 ac_cs_success=:
 exec 5>/dev/null
! $SHELL $CONFIG_STATUS || ac_cs_success=false
 exec 5>>config.log
 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.434
retrieving revision 1.435
diff -C2 -d -r1.434 -r1.435
*** configure.in	20 Sep 2003 15:30:19 -0000	1.434
--- configure.in	22 Sep 2003 11:14:40 -0000	1.435
***************
*** 2690,2693 ****
--- 2690,2712 ----
 AC_MSG_RESULT($have_ucs4_tcl)
 
+ # check whether wchar_t is signed or not
+ if test "$wchar_h" = yes
+ then
+ # check whether wchar_t is signed or not
+ AC_MSG_CHECKING(whether wchar_t is signed)
+ AC_CACHE_VAL(ac_cv_wchar_t_signed, [
+ AC_TRY_RUN([
+ #include <wchar.h>
+ int main()
+ {
+ exit((((wchar_t) -1) < ((wchar_t) 0)) ? 1 : 0);
+ }
+ ],
+ ac_cv_wchar_t_signed=yes,
+ ac_cv_wchar_t_signed=no,
+ ac_cv_wchar_t_signed=yes)])
+ AC_MSG_RESULT($ac_cv_wchar_t_signed)
+ fi
+ 
 AC_MSG_CHECKING(what type to use for unicode)
 dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
***************
*** 2731,2740 ****
 AC_DEFINE(Py_USING_UNICODE, 1,
 [Define if you want to have a Unicode type.])
! if test "$unicode_size" = "$ac_cv_sizeof_wchar_t"
 then
 PY_UNICODE_TYPE="wchar_t"
 AC_DEFINE(HAVE_USABLE_WCHAR_T, 1,
 [Define if you have a useable wchar_t type defined in wchar.h; useable
! means wchar_t must be 16-bit unsigned type. (see
 Include/unicodeobject.h).])
 AC_DEFINE(PY_UNICODE_TYPE,wchar_t)
--- 2750,2762 ----
 AC_DEFINE(Py_USING_UNICODE, 1,
 [Define if you want to have a Unicode type.])
! 
! # wchar_t is only usable if it maps to an unsigned type
! if test "$unicode_size" = "$ac_cv_sizeof_wchar_t" \
! -a "$ac_cv_wchar_t_signed" == "no"
 then
 PY_UNICODE_TYPE="wchar_t"
 AC_DEFINE(HAVE_USABLE_WCHAR_T, 1,
 [Define if you have a useable wchar_t type defined in wchar.h; useable
! means wchar_t must be an unsigned type with at least 16 bits. (see
 Include/unicodeobject.h).])
 AC_DEFINE(PY_UNICODE_TYPE,wchar_t)