[Python-checkins] CVS: python/dist/src configure,1.214,1.215 configure.in,1.222,1.223
Martin v. L?wis
loewis@users.sourceforge.net
Wed, 27 Jun 2001 13:22:06 -0700
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv1000
Modified Files:
configure configure.in
Log Message:
Default to ucs2 when no argument to --enable-unicode is specified.
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.214
retrieving revision 1.215
diff -C2 -r1.214 -r1.215
*** configure 2001/06/26 22:22:36 1.214
--- configure 2001/06/27 20:22:04 1.215
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.221
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.222
# Guess values for system-dependent variables and create Makefiles.
***************
*** 6580,6589 ****
if test $enable_unicode = yes
then
! # Let Py_UNICODE size depend on wchar_t size
! case "$ac_cv_sizeof_wchar_t" in
! 2) enable_unicode="ucs2";;
! 4) enable_unicode="ucs4";;
! *) enable_unicode="ucs4";; # default to UCS-4
! esac
fi
--- 6580,6585 ----
if test $enable_unicode = yes
then
! # Without any arguments, Py_UNICODE defaults to two-byte mode
! enable_unicode="ucs2"
fi
***************
*** 6644,6648 ****
# check for endianness
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
! echo "configure:6647: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 6640,6644 ----
# check for endianness
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
! echo "configure:6643: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6651,6655 ****
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
! #line 6654 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 6647,6651 ----
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
! #line 6650 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 6662,6670 ****
; return 0; }
EOF
! if { (eval echo configure:6665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
! #line 6669 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 6658,6666 ----
; return 0; }
EOF
! if { (eval echo configure:6661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
! #line 6665 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 6677,6681 ****
; return 0; }
EOF
! if { (eval echo configure:6680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
--- 6673,6677 ----
; return 0; }
EOF
! if { (eval echo configure:6676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
***************
*** 6697,6701 ****
else
cat > conftest.$ac_ext <<EOF
! #line 6700 "configure"
#include "confdefs.h"
main () {
--- 6693,6697 ----
else
cat > conftest.$ac_ext <<EOF
! #line 6696 "configure"
#include "confdefs.h"
main () {
***************
*** 6710,6714 ****
}
EOF
! if { (eval echo configure:6713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
--- 6706,6710 ----
}
EOF
! if { (eval echo configure:6709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
***************
*** 6737,6741 ****
# or fills with zeros (like the Cray J90, according to Tim Peters).
echo $ac_n "checking whether right shift extends the sign bit""... $ac_c" 1>&6
! echo "configure:6740: checking whether right shift extends the sign bit" >&5
if eval "test \"`echo '$''{'ac_cv_rshift_extends_sign'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 6733,6737 ----
# or fills with zeros (like the Cray J90, according to Tim Peters).
echo $ac_n "checking whether right shift extends the sign bit""... $ac_c" 1>&6
! echo "configure:6736: checking whether right shift extends the sign bit" >&5
if eval "test \"`echo '$''{'ac_cv_rshift_extends_sign'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6746,6750 ****
else
cat > conftest.$ac_ext <<EOF
! #line 6749 "configure"
#include "confdefs.h"
--- 6742,6746 ----
else
cat > conftest.$ac_ext <<EOF
! #line 6745 "configure"
#include "confdefs.h"
***************
*** 6755,6759 ****
EOF
! if { (eval echo configure:6758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_rshift_extends_sign=yes
--- 6751,6755 ----
EOF
! if { (eval echo configure:6754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_rshift_extends_sign=yes
***************
*** 6780,6784 ****
# check for getc_unlocked and related locking functions
echo $ac_n "checking for getc_unlocked() and friends""... $ac_c" 1>&6
! echo "configure:6783: checking for getc_unlocked() and friends" >&5
if eval "test \"`echo '$''{'ac_cv_have_getc_unlocked'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 6776,6780 ----
# check for getc_unlocked and related locking functions
echo $ac_n "checking for getc_unlocked() and friends""... $ac_c" 1>&6
! echo "configure:6779: checking for getc_unlocked() and friends" >&5
if eval "test \"`echo '$''{'ac_cv_have_getc_unlocked'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6786,6790 ****
cat > conftest.$ac_ext <<EOF
! #line 6789 "configure"
#include "confdefs.h"
#include <stdio.h>
--- 6782,6786 ----
cat > conftest.$ac_ext <<EOF
! #line 6785 "configure"
#include "confdefs.h"
#include <stdio.h>
***************
*** 6798,6802 ****
; return 0; }
EOF
! if { (eval echo configure:6801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_getc_unlocked=yes
--- 6794,6798 ----
; return 0; }
EOF
! if { (eval echo configure:6797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_getc_unlocked=yes
***************
*** 6827,6836 ****
EOF
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:6830: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 6835 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 6823,6832 ----
EOF
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:6826: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 6831 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 6881,6885 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6884: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 6877,6881 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6880: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.222
retrieving revision 1.223
diff -C2 -r1.222 -r1.223
*** configure.in 2001/06/26 22:22:36 1.222
--- configure.in 2001/06/27 20:22:04 1.223
***************
*** 1591,1600 ****
if test $enable_unicode = yes
then
! # Let Py_UNICODE size depend on wchar_t size
! case "$ac_cv_sizeof_wchar_t" in
! 2) enable_unicode="ucs2";;
! 4) enable_unicode="ucs4";;
! *) enable_unicode="ucs4";; # default to UCS-4
! esac
fi
--- 1591,1596 ----
if test $enable_unicode = yes
then
! # Without any arguments, Py_UNICODE defaults to two-byte mode
! enable_unicode="ucs2"
fi