mirror of
https://github.com/python/cpython.git
synced 2024-11-23 09:54:58 +08:00
Part of the Unicode checkin for Marc-Andre Lemburg.
Some new configuration tests and a new option, --with-wctype-functions.
This commit is contained in:
Guido van Rossum
parent
92f3377078
commit
ef2255b1dd
12
acconfig.h
12
acconfig.h
@ -100,6 +100,18 @@
|
||||
/* Define if you want SIGFPE handled (see Include/pyfpe.h). */
|
||||
#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,
|
||||
ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
|
||||
|
||||
31
config.h.in
31
config.h.in
@ -25,6 +25,9 @@
|
||||
tzname. */
|
||||
#undef HAVE_TZNAME
|
||||
|
||||
/* Define as __inline if that's what the C compiler calls it. */
|
||||
#undef inline
|
||||
|
||||
/* Define if on MINIX. */
|
||||
#undef _MINIX
|
||||
|
||||
@ -62,6 +65,10 @@
|
||||
/* Define to `int' if <sys/types.h> doesn't define. */
|
||||
#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) */
|
||||
#undef BAD_EXEC_PROTOTYPES
|
||||
@ -155,6 +162,18 @@
|
||||
/* Define if you want SIGFPE handled (see Include/pyfpe.h). */
|
||||
#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,
|
||||
ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
|
||||
@ -200,6 +219,15 @@
|
||||
/* Defined when any dynamic module loading is enabled */
|
||||
#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,6 +237,9 @@
|
||||
/* 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 *. */
|
||||
#undef SIZEOF_VOID_P
|
||||
|
||||
|
||||
48
configure.in
48
configure.in
@ -373,6 +373,7 @@ cat >> confdefs.h <<\EOF
|
||||
#endif
|
||||
EOF
|
||||
|
||||
# Type availability checks
|
||||
AC_TYPE_MODE_T
|
||||
AC_TYPE_OFF_T
|
||||
AC_TYPE_PID_T
|
||||
@ -380,9 +381,14 @@ AC_TYPE_SIGNAL
|
||||
AC_TYPE_SIZE_T
|
||||
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)
|
||||
have_long_long=no
|
||||
@ -791,8 +797,8 @@ AC_MSG_RESULT($was_it_defined)
|
||||
# checks for compiler characteristics
|
||||
|
||||
AC_C_CHAR_UNSIGNED
|
||||
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
|
||||
works=no
|
||||
AC_MSG_CHECKING(for working volatile)
|
||||
@ -942,7 +948,8 @@ AC_ARG_WITH(fpectl, [--with-fpectl enable SIGFPE catching], [
|
||||
if test "$withval" != no
|
||||
then AC_DEFINE(WANT_SIGFPE_HANDLER) AC_MSG_RESULT(yes)
|
||||
else AC_MSG_RESULT(no)
|
||||
fi])
|
||||
fi],
|
||||
[AC_MSG_RESULT(no)])
|
||||
|
||||
# check for --with-libm=...
|
||||
AC_SUBST(LIBM)
|
||||
@ -1025,6 +1032,43 @@ then
|
||||
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
|
||||
AC_OUTPUT(Makefile \
|
||||
Objects/Makefile \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user