[Python-checkins] CVS: python/dist/src acconfig.h,1.26,1.27 config.h.in,2.51,2.52 configure,1.108,1.109 configure.in,1.116,1.117
Guido van Rossum
guido@cnri.reston.va.us
Fri, 10 Mar 2000 17:30:33 -0500 (EST)
Update of /projects/cvsroot/python/dist/src
In directory eric:/home/guido/hp/mal/py-patched
Modified Files:
acconfig.h config.h.in configure configure.in
Log Message:
Part of the Unicode checkin for Marc-Andre Lemburg.
Some new configuration tests and a new option, --with-wctype-functions.
Index: acconfig.h
===================================================================
RCS file: /projects/cvsroot/python/dist/src/acconfig.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** acconfig.h 1999/12/20 21:24:37 1.26
--- acconfig.h 2000/03/10 22:30:28 1.27
***************
*** 101,104 ****
--- 101,116 ----
#undef WANT_SIGFPE_HANDLER
+ /* Define if the compiler provides a wchar.h header file. */
+ #undef HAVE_WCHAR_H
+
+ /* 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). */
+ #undef HAVE_USABLE_WCHAR_T
+
+ /* Define if you want wctype.h functions to be used instead of the
+ one supplied by Python itself. (see Include/unicodectype.h). */
+ #undef WANT_WCTYPE_FUNCTIONS
+
/* Define if you want to use SGI (IRIX 4) dynamic linking.
This requires the "dl" library by Jack Jansen,
Index: config.h.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/config.h.in,v
retrieving revision 2.51
retrieving revision 2.52
diff -C2 -r2.51 -r2.52
*** config.h.in 1999/12/20 21:25:59 2.51
--- config.h.in 2000/03/10 22:30:29 2.52
***************
*** 26,29 ****
--- 26,32 ----
#undef HAVE_TZNAME
+ /* Define as __inline if that's what the C compiler calls it. */
+ #undef inline
+
/* Define if on MINIX. */
#undef _MINIX
***************
*** 63,66 ****
--- 66,73 ----
#undef uid_t
+ /* Define if your processor stores words with the most significant
+ byte first (like Motorola and SPARC, unlike Intel and VAX). */
+ #undef WORDS_BIGENDIAN
+
/* Define if your <unistd.h> contains bad prototypes for exec*()
(as it does on SGI IRIX 4.x) */
***************
*** 156,159 ****
--- 163,178 ----
#undef WANT_SIGFPE_HANDLER
+ /* Define if the compiler provides a wchar.h header file. */
+ #undef HAVE_WCHAR_H
+
+ /* 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). */
+ #undef HAVE_USABLE_WCHAR_T
+
+ /* Define if you want wctype.h functions to be used instead of the
+ one supplied by Python itself. (see Include/unicodectype.h). */
+ #undef WANT_WCTYPE_FUNCTIONS
+
/* Define if you want to use SGI (IRIX 4) dynamic linking.
This requires the "dl" library by Jack Jansen,
***************
*** 201,204 ****
--- 220,232 ----
#undef HAVE_DYNAMIC_LOADING
+ /* The number of bytes in a char. */
+ #undef SIZEOF_CHAR
+
+ /* The number of bytes in a double. */
+ #undef SIZEOF_DOUBLE
+
+ /* The number of bytes in a float. */
+ #undef SIZEOF_FLOAT
+
/* The number of bytes in a int. */
#undef SIZEOF_INT
***************
*** 209,212 ****
--- 237,243 ----
/* The number of bytes in a long long. */
#undef SIZEOF_LONG_LONG
+
+ /* The number of bytes in a short. */
+ #undef SIZEOF_SHORT
/* The number of bytes in a void *. */
Index: configure
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -r1.108 -r1.109
*** configure 2000/02/25 19:26:30 1.108
--- configure 2000/03/10 22:30:29 1.109
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.116
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.117
[...3541 lines suppressed...]
+ # Check for --with-wctype-functions
+ echo $ac_n "checking for --with-wctype-functions""... $ac_c" 1>&6
+ echo "configure:5187: checking for --with-wctype-functions" >&5
+ # Check whether --with-wctype-functions or --without-wctype-functions was given.
+ if test "${with_wctype_functions+set}" = set; then
+ withval="$with_wctype_functions"
+
+ if test "$withval" != no
+ then cat >> confdefs.h <<\EOF
+ #define WANT_WCTYPE_FUNCTIONS 1
+ EOF
+ echo "$ac_t""yes" 1>&6
+ else echo "$ac_t""no" 1>&6
+ fi
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
# generate output files
Index: configure.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -r1.116 -r1.117
*** configure.in 2000/02/25 19:26:31 1.116
--- configure.in 2000/03/10 22:30:29 1.117
***************
*** 1,4 ****
dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.116 $)
AC_PREREQ(2.0)
AC_INIT(Include/object.h)
--- 1,4 ----
dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.117 $)
AC_PREREQ(2.0)
AC_INIT(Include/object.h)
***************
*** 374,377 ****
--- 374,378 ----
EOF
+ # Type availability checks
AC_TYPE_MODE_T
AC_TYPE_OFF_T
***************
*** 381,387 ****
--- 382,393 ----
AC_TYPE_UID_T
+ # Sizes of various common basic types
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(void *)
+ AC_CHECK_SIZEOF(char)
+ AC_CHECK_SIZEOF(short)
+ AC_CHECK_SIZEOF(float)
+ AC_CHECK_SIZEOF(double)
AC_MSG_CHECKING(for long long support)
***************
*** 792,797 ****
AC_C_CHAR_UNSIGNED
-
AC_C_CONST
works=no
--- 798,803 ----
AC_C_CHAR_UNSIGNED
AC_C_CONST
+ AC_C_INLINE
works=no
***************
*** 943,947 ****
then AC_DEFINE(WANT_SIGFPE_HANDLER) AC_MSG_RESULT(yes)
else AC_MSG_RESULT(no)
! fi])
# check for --with-libm=...
--- 949,954 ----
then AC_DEFINE(WANT_SIGFPE_HANDLER) AC_MSG_RESULT(yes)
else AC_MSG_RESULT(no)
! fi],
! [AC_MSG_RESULT(no)])
# check for --with-libm=...
***************
*** 1025,1028 ****
--- 1032,1072 ----
AC_DEFINE(MALLOC_ZERO_RETURNS_NULL)
fi
+
+ # check for wchar.h
+ AC_CHECK_HEADER(wchar.h,
+ AC_DEFINE(HAVE_WCHAR_H) wchar_h="yes",
+ wchar_h="no"
+ )
+
+ # check for usable wchar_t
+ usable_wchar_t="unkown"
+ AC_MSG_CHECKING(for usable wchar_t)
+ AC_TRY_RUN([
+ #include "wchar.h"
+ #include "wctype.h"
+ main() {
+ wchar_t s;
+ if (sizeof(s) == 2)
+ exit(0);
+ else
+ exit(1);
+ }
+ ],
+ AC_DEFINE(HAVE_USABLE_WCHAR_T) usable_wchar_t="yes",
+ usable_wchar_t="no")
+ AC_MSG_RESULT($usable_wchar_t)
+
+ # check for endianness
+ AC_C_BIGENDIAN
+
+ # Check for --with-wctype-functions
+ AC_MSG_CHECKING(for --with-wctype-functions)
+ AC_ARG_WITH(wctype-functions,
+ [--with-wctype-functions use wctype.h functions], [
+ if test "$withval" != no
+ then AC_DEFINE(WANT_WCTYPE_FUNCTIONS) AC_MSG_RESULT(yes)
+ else AC_MSG_RESULT(no)
+ fi],
+ [AC_MSG_RESULT(no)])
# generate output files