Mailing List Archive

CVS: python/dist/src acconfig.h,1.59,1.60 configure,1.293,1.294 configure.in,1.303,1.304 pyconfig.h.in,1.25,1.26
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv9051

Modified Files:
acconfig.h configure configure.in pyconfig.h.in
Log Message:
Move autoheader declarations into configure.in.


Index: acconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/acconfig.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** acconfig.h 1 Jan 2002 18:41:32 -0000 1.59
--- acconfig.h 6 Apr 2002 10:10:47 -0000 1.60
***************
*** 2,69 ****


- /* Define for AIX if your compiler is a genuine IBM xlC/xlC_r
- and you want support for AIX C++ shared extension modules. */
- #undef AIX_GENUINE_CPLUSPLUS
-
- /* Define if your <unistd.h> contains bad prototypes for exec*()
- (as it does on SGI IRIX 4.x) */
- #undef BAD_EXEC_PROTOTYPES
-
- /* Define if your compiler botches static forward declarations
- (as it does on SCI ODT 3.0) */
- #undef BAD_STATIC_FORWARD
-
- /* Define this if you have BeOS threads */
- #undef BEOS_THREADS
-
/* Define if you have the Mach cthreads package */
#undef C_THREADS

- /* Define if you are using Mach cthreads under mach / */
- #undef MACH_C_THREADS
-
- /* Define if you are using Mach cthreads directly under /include */
- #undef HURD_C_THREADS
-
- /* Define to `long' if <time.h> doesn't define. */
- #undef clock_t
-
- /* Defined on Solaris to see additional function prototypes. */
- #undef __EXTENSIONS__
-
- /* This must be set to 64 on some systems to enable large file support */
- #undef _FILE_OFFSET_BITS
-
- /* Define if getpgrp() must be called as getpgrp(0). */
- #undef GETPGRP_HAVE_ARG
-
- /* Define if gettimeofday() does not have second (timezone) argument
- This is the case on Motorola V4 (R40V4.2) */
- #undef GETTIMEOFDAY_NO_TZ
-
- /* Define this if your time.h defines altzone */
- #undef HAVE_ALTZONE
-
/* Define if --enable-ipv6 is specified */
#undef ENABLE_IPV6

- /* Define if sockaddr has sa_len member */
- #undef HAVE_SOCKADDR_SA_LEN
-
- /* struct addrinfo (netdb.h) */
- #undef HAVE_ADDRINFO
-
- /* Define if you have the getaddrinfo function. */
- #undef HAVE_GETADDRINFO
-
- /* struct sockaddr_storage (sys/socket.h) */
- #undef HAVE_SOCKADDR_STORAGE
-
- /* Defined when any dynamic module loading is enabled */
- #undef HAVE_DYNAMIC_LOADING
-
- /* Define this if you have flockfile(), getc_unlocked(), and funlockfile() */
- #undef HAVE_GETC_UNLOCKED
-
/* Define this if you have gethostbyname() */
#undef HAVE_GETHOSTBYNAME
--- 2,11 ----
***************
*** 72,130 ****
#undef HAVE_GETHOSTBYNAME_R

- /* Define this if you have the 3-arg version of gethostbyname_r() */
- #undef HAVE_GETHOSTBYNAME_R_3_ARG
-
- /* Define this if you have the 5-arg version of gethostbyname_r() */
- #undef HAVE_GETHOSTBYNAME_R_5_ARG
-
- /* Define this if you have the 6-arg version of gethostbyname_r() */
- #undef HAVE_GETHOSTBYNAME_R_6_ARG
-
- /* Defined to enable large file support when an off_t is bigger than a long
- and long long is available and at least as big as an off_t. You may need
- to add some flags for configuration and compilation to enable this mode.
- (For Solaris and Linux, the necessary defines are already defined.)
- */
- #undef HAVE_LARGEFILE_SUPPORT
-
- /* Define this if you have the type long long */
- #undef HAVE_LONG_LONG
-
- /* Define if your compiler supports function prototypes */
- #undef HAVE_PROTOTYPES
-
- /* Define if you have GNU PTH threads */
- #undef HAVE_PTH
-
- /* Define if you have readline 4.0 */
- #undef HAVE_RL_PRE_INPUT_HOOK
-
- /* Define if you have readline 4.2 */
- #undef HAVE_RL_COMPLETION_MATCHES
-
- /* Define if your compiler supports variable length function prototypes
- (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */
- #undef HAVE_STDARG_PROTOTYPES
-
/* Define if you have termios available */
#undef HAVE_TERMIOS_H

- /* Define this if you have the type uintptr_t */
- #undef HAVE_UINTPTR_T
-
- /* 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 the compiler provides a wchar.h header file. */
- #undef HAVE_WCHAR_H
-
- /* This must be defined on some systems to enable large file support */
- #undef _LARGEFILE_SOURCE
-
- /* Define if you want to have a Unicode type. */
- #undef Py_USING_UNICODE
-
/* Define as the integral type used for Unicode representation. */
#undef PY_UNICODE_TYPE
--- 14,20 ----
***************
*** 133,174 ****
#undef Py_UNICODE_SIZE

- /* Define if nice() returns success/failure instead of the new priority. */
- #undef HAVE_BROKEN_NICE
-
- /* Define if malloc(0) returns a NULL pointer */
- #undef MALLOC_ZERO_RETURNS_NULL
-
- /* Define if you have POSIX threads */
- #undef _POSIX_THREADS
-
- /* Define if you want to build an interpreter with many run-time checks */
- #undef Py_DEBUG
-
/* Define to force use of thread-safe errno, h_errno, and other functions */
#undef _REENTRANT

- /* Define if setpgrp() must be called as setpgrp(0, 0). */
- #undef SETPGRP_HAVE_ARG
-
- /* Define to empty if the keyword does not work. */
- #undef signed
-
- /* Define if i>>j for signed int i does not extend the sign bit
- when i < 0
- */
- #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS
-
- /* The number of bytes in an off_t. */
- #undef SIZEOF_OFF_T
-
- /* The number of bytes in a time_t. */
- #undef SIZEOF_TIME_T
-
- /* The number of bytes in a pthread_t. */
- #undef SIZEOF_PTHREAD_T
-
- /* Defined if PTHREAD_SCOPE_SYSTEM supported. */
- #undef PTHREAD_SYSTEM_SCHED_SUPPORTED
-
/* sizeof(void *) */
#undef SIZEOF_VOID_P
--- 23,29 ----
***************
*** 180,219 ****
#undef SOLARIS

- /* Define if you can safely include both <sys/select.h> and <sys/time.h>
- (which you can't on SCO ODT 3.0). */
- #undef SYS_SELECT_WITH_SYS_TIME
-
- /* Define if a va_list is an array of some kind */
- #undef VA_LIST_IS_ARRAY
-
- /* Define to empty if the keyword does not work. */
- #undef volatile
-
- /* Define if you want SIGFPE handled (see Include/pyfpe.h). */
- #undef WANT_SIGFPE_HANDLER
-
- /* 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 compile in cycle garbage collection */
- #undef WITH_CYCLE_GC
-
- /* Define if you want to emulate SGI (IRIX 4) dynamic linking.
- This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
- Sequent Symmetry (Dynix), and Atari ST.
- This requires the "dl-dld" library,
- ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z,
- as well as the "GNU dld" library,
- ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z.
- Don't bother on SunOS 4 or 5, they already have dynamic linking using
- shared libraries */
- #undef WITH_DL_DLD
-
- /* Define if you want to use the new-style (Openstep, Rhapsody, MacOS)
- dynamic linker (dyld) instead of the old-style (NextStep) dynamic
- linker (rld). Dyld is necessary to support frameworks. */
- #undef WITH_DYLD
-
/* Define if you want to use BSD db. */
#undef WITH_LIBDB
--- 35,38 ----
***************
*** 222,250 ****
#undef WITH_LIBNDBM

- /* Define if you want to compile in Python-specific mallocs */
- #undef WITH_PYMALLOC
-
- /* Define if you want to produce an OpenStep/Rhapsody framework
- (shared library plus accessory files). */
- #undef WITH_NEXT_FRAMEWORK
-
- /* Define if you want to use MacPython modules on MacOSX in unix-Python */
- #undef USE_TOOLBOX_OBJECT_GLUE
-
- /* 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.
- Don't bother on IRIX 5, it already has dynamic linking using SunOS
- style shared libraries */
- #undef WITH_SGI_DL
-
/* Define if you want to compile in rudimentary thread support */
#undef WITH_THREAD
-
- /* Define if mvwdelch in curses.h is an expression. */
- #undef MVWDELCH_IS_EXPRESSION
-
- /* Define if WINDOW in curses.h offers a field _flags. */
- #undef WINDOW_HAS_FLAGS


--- 41,46 ----

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.293
retrieving revision 1.294
diff -C2 -d -r1.293 -r1.294
*** configure 5 Apr 2002 16:50:53 -0000 1.293
--- configure 6 Apr 2002 10:10:48 -0000 1.294
***************
*** 1,5 ****
#! /bin/sh


# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----

! # From configure.in Revision: 1.303

[...4766 lines suppressed...]
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 7695 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 7701,7705 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7704: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 7741,7745 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7744: 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.303
retrieving revision 1.304
diff -C2 -d -r1.303 -r1.304
*** configure.in 5 Apr 2002 16:50:53 -0000 1.303
--- configure.in 6 Apr 2002 10:10:49 -0000 1.304
***************
*** 239,243 ****
SunOS*)
# Some functions have a prototype only with that define, e.g. confstr
! AC_DEFINE(__EXTENSIONS__)
;;
esac
--- 239,243 ----
SunOS*)
# Some functions have a prototype only with that define, e.g. confstr
! AC_DEFINE(__EXTENSIONS__, 1, [Defined on Solaris to see additional function prototypes.])
;;
esac
***************
*** 413,417 ****
[ --with-pydebug build with Py_DEBUG defined], [
if test "$withval" != no
! then AC_DEFINE(Py_DEBUG) AC_MSG_RESULT(yes); Py_DEBUG='true'
else AC_MSG_RESULT(no); Py_DEBUG='false'
fi],
--- 413,421 ----
[ --with-pydebug build with Py_DEBUG defined], [
if test "$withval" != no
! then
! AC_DEFINE(Py_DEBUG, 1,
! [.Define if you want to build an interpreter with many run-time checks.])
! AC_MSG_RESULT(yes);
! Py_DEBUG='true'
else AC_MSG_RESULT(no); Py_DEBUG='false'
fi],
***************
*** 581,591 ****
was_it_defined=no
AC_MSG_CHECKING(for clock_t in time.h)
! AC_EGREP_HEADER(clock_t, time.h, was_it_defined=yes, AC_DEFINE(clock_t, long))
AC_MSG_RESULT($was_it_defined)

# Two defines needed to enable largefile support on various platforms
# These may affect some typedefs
! AC_DEFINE(_LARGEFILE_SOURCE)
! AC_DEFINE(_FILE_OFFSET_BITS, 64)

# Add some code to confdefs.h so that the test for off_t works on SCO
--- 585,599 ----
was_it_defined=no
AC_MSG_CHECKING(for clock_t in time.h)
! AC_EGREP_HEADER(clock_t, time.h, was_it_defined=yes, [.
! AC_DEFINE(clock_t, long, [Define to 'long' if <time.h> doesn't define.])
! ])
AC_MSG_RESULT($was_it_defined)

# Two defines needed to enable largefile support on various platforms
# These may affect some typedefs
! AC_DEFINE(_LARGEFILE_SOURCE, 1,
! [.This must be defined on some systems to enable large file support.])
! AC_DEFINE(_FILE_OFFSET_BITS, 64,
! [.This must be set to 64 on some systems to enable large file support.])

# Add some code to confdefs.h so that the test for off_t works on SCO
***************
*** 616,620 ****
AC_MSG_CHECKING(for long long support)
have_long_long=no
! AC_TRY_COMPILE([], [long long x; x = (long long)0;], AC_DEFINE(HAVE_LONG_LONG) have_long_long=yes)
AC_MSG_RESULT($have_long_long)
if test "$have_long_long" = yes ; then
--- 624,631 ----
AC_MSG_CHECKING(for long long support)
have_long_long=no
! AC_TRY_COMPILE([], [long long x; x = (long long)0;], [.
! AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.])
! have_long_long=yes
! ])
AC_MSG_RESULT($have_long_long)
if test "$have_long_long" = yes ; then
***************
*** 624,628 ****
AC_MSG_CHECKING(for uintptr_t support)
have_uintptr_t=no
! AC_TRY_COMPILE([], [uintptr_t x; x = (uintptr_t)0;], AC_DEFINE(HAVE_UINTPTR_T) have_uintptr_t=yes)
AC_MSG_RESULT($have_uintptr_t)
if test "$have_uintptr_t" = yes ; then
--- 635,642 ----
AC_MSG_CHECKING(for uintptr_t support)
have_uintptr_t=no
! AC_TRY_COMPILE([], [uintptr_t x; x = (uintptr_t)0;], [.
! AC_DEFINE(HAVE_UINTPTR_T, 1, [Define this if you have the type uintptr_t.])
! have_uintptr_t=yes
! ])
AC_MSG_RESULT($have_uintptr_t)
if test "$have_uintptr_t" = yes ; then
***************
*** 647,651 ****
])
AC_MSG_RESULT($ac_cv_sizeof_off_t)
! AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t)

AC_MSG_CHECKING(whether to enable large file support)
--- 661,666 ----
])
AC_MSG_RESULT($ac_cv_sizeof_off_t)
! AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t,
! [The number of bytes in an off_t.])

AC_MSG_CHECKING(whether to enable large file support)
***************
*** 653,657 ****
"$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
"$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then
! AC_DEFINE(HAVE_LARGEFILE_SUPPORT)
AC_MSG_RESULT(yes)
else
--- 668,676 ----
"$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
"$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then
! AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
! [.Defined to enable large file support when an off_t is bigger than a long
! and long long is available and at least as big as an off_t. You may need
! to add some flags for configuration and compilation to enable this mode.
! (For Solaris and Linux, the necessary defines are already defined.)])
AC_MSG_RESULT(yes)
else
***************
*** 676,680 ****
])
AC_MSG_RESULT($ac_cv_sizeof_time_t)
! AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t)


--- 695,700 ----
])
AC_MSG_RESULT($ac_cv_sizeof_time_t)
! AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t,
! [The number of bytes in a time_t.])


***************
*** 706,710 ****
])
AC_MSG_RESULT($ac_cv_sizeof_pthread_t)
! AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t)
fi
CC="$ac_save_cc"
--- 726,731 ----
])
AC_MSG_RESULT($ac_cv_sizeof_pthread_t)
! AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t,
! [The number of bytes in a pthread_t.])
fi
CC="$ac_save_cc"
***************
*** 728,732 ****
extra_machdep_objs="Python/mactoolboxglue.o"
extra_undefs="-u __dummy -u _PyMac_Error"
! AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE)
;;
*)
--- 749,754 ----
extra_machdep_objs="Python/mactoolboxglue.o"
extra_undefs="-u __dummy -u _PyMac_Error"
! AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE, 1,
! [.Define if you want to use MacPython modules on MacOSX in unix-Python.])
;;
*)
***************
*** 767,771 ****
Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
esac
! AC_DEFINE(WITH_NEXT_FRAMEWORK)
AC_MSG_RESULT(yes)
else
--- 789,795 ----
Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
esac
! AC_DEFINE(WITH_NEXT_FRAMEWORK, 1,
! [.Define if you want to produce an OpenStep/Rhapsody framework
! (shared library plus accessory files).])
AC_MSG_RESULT(yes)
else
***************
*** 776,780 ****
case $ac_sys_system/$ac_sys_release in
Darwin/*)
! AC_DEFINE(WITH_DYLD)
AC_MSG_RESULT(always on for Darwin)
;;
--- 800,807 ----
case $ac_sys_system/$ac_sys_release in
Darwin/*)
! AC_DEFINE(WITH_DYLD, 1,
! [.Define if you want to use the new-style (Openstep, Rhapsody, MacOS)
! dynamic linker (dyld) instead of the old-style (NextStep) dynamic
! linker (rld). Dyld is necessary to support frameworks.])
AC_MSG_RESULT(always on for Darwin)
;;
***************
*** 973,977 ****
AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"],
[loadAndInit("", 0, "")],
! [AC_DEFINE(AIX_GENUINE_CPLUSPLUS)
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]);;
--- 1000,1006 ----
AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"],
[loadAndInit("", 0, "")],
! [.AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1,
! [.Define for AIX if your compiler is a genuine IBM xlC/xlC_r
! and you want support for AIX C++ shared extension modules.])
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]);;
***************
*** 1090,1099 ****
AC_CHECK_HEADER(cthreads.h, [AC_DEFINE(WITH_THREAD)
AC_DEFINE(C_THREADS)
! AC_DEFINE(HURD_C_THREADS)
LIBS="$LIBS -lthreads"
THREADOBJ="Python/thread.o"],[
AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
AC_DEFINE(C_THREADS)
! AC_DEFINE(MACH_C_THREADS)
THREADOBJ="Python/thread.o"],[
AC_MSG_CHECKING(for --with-pth)
--- 1119,1130 ----
AC_CHECK_HEADER(cthreads.h, [AC_DEFINE(WITH_THREAD)
AC_DEFINE(C_THREADS)
! AC_DEFINE(HURD_C_THREADS, 1,
! [Define if you are using Mach cthreads directly under /include])
LIBS="$LIBS -lthreads"
THREADOBJ="Python/thread.o"],[
AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
AC_DEFINE(C_THREADS)
! AC_DEFINE(MACH_C_THREADS, 1,
! [Define if you are using Mach cthreads under mach /])
THREADOBJ="Python/thread.o"],[
AC_MSG_CHECKING(for --with-pth)
***************
*** 1102,1106 ****
AC_MSG_RESULT($withval)
AC_DEFINE(WITH_THREAD)
! AC_DEFINE(HAVE_PTH)
LIBS="-lpth $LIBS"
THREADOBJ="Python/thread.o"],[
--- 1133,1137 ----
AC_MSG_RESULT($withval)
AC_DEFINE(WITH_THREAD)
! AC_DEFINE(HAVE_PTH, 1, [Define if you have GNU PTH threads.])
LIBS="-lpth $LIBS"
THREADOBJ="Python/thread.o"],[
***************
*** 1126,1130 ****
THREADOBJ="Python/thread.o"],[
AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(BEOS_THREADS)
THREADOBJ="Python/thread.o"],[
AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
--- 1157,1162 ----
THREADOBJ="Python/thread.o"],[
AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(BEOS_THREADS, 1,
! [Define this if you have BeOS threads.])
THREADOBJ="Python/thread.o"],[.
AC_CHECK_LIB(pthreads, pthread_create, [.AC_DEFINE(WITH_THREAD)
***************
*** 1153,1157 ****
if test "$posix_threads" = "yes"; then
if test "$unistd_defines_pthreads" = "no"; then
! AC_DEFINE(_POSIX_THREADS)
fi

--- 1185,1191 ----
if test "$posix_threads" = "yes"; then
if test "$unistd_defines_pthreads" = "no"; then
! AC_DEFINE(_POSIX_THREADS, 1,
! [.Define if you have POSIX threads,
! and your system does not define that.])
fi

***************
*** 1176,1180 ****
AC_MSG_RESULT($ac_cv_pthread_system_supported)
if test "$ac_cv_pthread_system_supported" = "yes"; then
! AC_DEFINE(PTHREAD_SYSTEM_SCHED_SUPPORTED)
fi
AC_CHECK_FUNCS(pthread_sigmask)
--- 1210,1214 ----
AC_MSG_RESULT($ac_cv_pthread_system_supported)
if test "$ac_cv_pthread_system_supported" = "yes"; then
! AC_DEFINE(PTHREAD_SYSTEM_SCHED_SUPPORTED, 1, [Defined if PTHREAD_SCOPE_SYSTEM supported.])
fi
AC_CHECK_FUNCS(pthread_sigmask)
***************
*** 1379,1383 ****
if test "$with_cycle_gc" != "no"
then
! AC_DEFINE(WITH_CYCLE_GC)
fi
AC_MSG_RESULT($with_cycle_gc)
--- 1413,1418 ----
if test "$with_cycle_gc" != "no"
then
! AC_DEFINE(WITH_CYCLE_GC, 1,
! [Define if you want to compile in cycle garbage collection.])
fi
AC_MSG_RESULT($with_cycle_gc)
***************
*** 1393,1397 ****
if test "$with_pymalloc" != "no"
then
! AC_DEFINE(WITH_PYMALLOC)
fi
AC_MSG_RESULT($with_pymalloc)
--- 1428,1433 ----
if test "$with_pymalloc" != "no"
then
! AC_DEFINE(WITH_PYMALLOC, 1,
! [Define if you want to compile in Python-specific mallocs])
fi
AC_MSG_RESULT($with_pymalloc)
***************
*** 1402,1406 ****
[ --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],
--- 1438,1446 ----
[ --with-wctype-functions use wctype.h functions], [
if test "$withval" != no
! then
! AC_DEFINE(WANT_WCTYPE_FUNCTIONS, 1,
! [.Define if you want wctype.h functions to be used instead of the
! one supplied by Python itself. (see Include/unicodectype.h).])
! AC_MSG_RESULT(yes)
else AC_MSG_RESULT(no)
fi],
***************
*** 1415,1419 ****
[ --with-sgi-dl=DIRECTORY IRIX 4 dynamic linking], [
AC_MSG_RESULT($withval)
! AC_DEFINE(WITH_SGI_DL)
DYNLOADFILE="dynload_dl.o"
dldir=$withval
--- 1455,1464 ----
[ --with-sgi-dl=DIRECTORY IRIX 4 dynamic linking], [
AC_MSG_RESULT($withval)
! AC_DEFINE(WITH_SGI_DL, 1,
! [.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.
! Do not bother on IRIX 5, it already has dynamic linking using SunOS
! style shared libraries])
DYNLOADFILE="dynload_dl.o"
dldir=$withval
***************
*** 1428,1432 ****
AC_ARG_WITH(dl-dld, [ --with-dl-dld=DL_DIR,DLD_DIR GNU dynamic linking], [
AC_MSG_RESULT($withval)
! AC_DEFINE(WITH_DL_DLD)
DYNLOADFILE="dynload_dl.o"
dldir=`echo "$withval" | sed 's/,.*//'`
--- 1473,1486 ----
AC_ARG_WITH(dl-dld, [ --with-dl-dld=DL_DIR,DLD_DIR GNU dynamic linking], [
AC_MSG_RESULT($withval)
! AC_DEFINE(WITH_DL_DLD, 1,
! [.Define if you want to emulate SGI (IRIX 4) dynamic linking.
! This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
! Sequent Symmetry (Dynix), and Atari ST.
! This requires the 'dl-dld' library,
! ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z,
! as well as the 'GNU dld' library,
! ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z.
! Do not bother on SunOS 4 or 5, they already have dynamic linking using
! shared libraries.])
DYNLOADFILE="dynload_dl.o"
dldir=`echo "$withval" | sed 's/,.*//'`
***************
*** 1467,1471 ****
if test "$DYNLOADFILE" != "dynload_stub.o"
then
! AC_DEFINE(HAVE_DYNAMIC_LOADING)
fi

--- 1521,1526 ----
if test "$DYNLOADFILE" != "dynload_stub.o"
then
! AC_DEFINE(HAVE_DYNAMIC_LOADING, 1,
! [Defined when any dynamic module loading is enabled.])
fi

***************
*** 1497,1502 ****
# check for openpty and forkpty

! AC_CHECK_FUNCS(openpty,, AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"]))
! AC_CHECK_FUNCS(forkpty,, AC_CHECK_LIB(util,forkpty, [AC_DEFINE(HAVE_FORKPTY)] [LIBS="$LIBS -lutil"]))

# check for long file support functions
--- 1552,1557 ----
# check for openpty and forkpty

! AC_CHECK_FUNCS(openpty,, AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY) LIBS="$LIBS -lutil"]))
! AC_CHECK_FUNCS(forkpty,, AC_CHECK_LIB(util,forkpty, [AC_DEFINE(HAVE_FORKPTY) LIBS="$LIBS -lutil"]))

# check for long file support functions
***************
*** 1504,1510 ****

AC_REPLACE_FUNCS(dup2 getcwd strdup strerror memmove)
! AC_CHECK_FUNCS(getpgrp, AC_TRY_COMPILE([#include <unistd.h>], [getpgrp(0);], AC_DEFINE(GETPGRP_HAVE_ARG)))
! AC_CHECK_FUNCS(setpgrp, AC_TRY_COMPILE([#include <unistd.h>], [setpgrp(0,0);], AC_DEFINE(SETPGRP_HAVE_ARG)))
! AC_CHECK_FUNCS(gettimeofday, AC_TRY_COMPILE([#include <sys/time.h>], [gettimeofday((struct timeval*)0,(struct timezone*)0);], ,AC_DEFINE(GETTIMEOFDAY_NO_TZ)))


--- 1559,1584 ----

AC_REPLACE_FUNCS(dup2 getcwd strdup strerror memmove)
! AC_CHECK_FUNCS(getpgrp,
! AC_TRY_COMPILE([#include <unistd.h>],
! [getpgrp(0);],
! AC_DEFINE(GETPGRP_HAVE_ARG, 1,
! [Define if getpgrp() must be called as getpgrp(0).])
! )
! )
! AC_CHECK_FUNCS(setpgrp,
! AC_TRY_COMPILE([#include <unistd.h>],
! [setpgrp(0,0);],
! AC_DEFINE(SETPGRP_HAVE_ARG, 1,
! [Define if setpgrp() must be called as setpgrp(0, 0).])
! )
! )
! AC_CHECK_FUNCS(gettimeofday,
! AC_TRY_COMPILE([#include <sys/time.h>],
! [gettimeofday((struct timeval*)0,(struct timezone*)0);], ,
! AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1,
! [.Define if gettimeofday() does not have second (timezone) argument
! This is the case on Motorola V4 (R40V4.2)])
! )
! )


***************
*** 1625,1629 ****
fi
else
! AC_DEFINE(HAVE_GETADDRINFO)
fi
AC_CHECK_FUNCS(getnameinfo)
--- 1699,1703 ----
fi
else
! AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if you have the getaddrinfo function.])
fi
AC_CHECK_FUNCS(getnameinfo)
***************
*** 1644,1648 ****
AC_MSG_RESULT($ac_cv_header_time_altzone)
if test $ac_cv_header_time_altzone = yes; then
! AC_DEFINE(HAVE_ALTZONE)
fi

--- 1718,1722 ----
AC_MSG_RESULT($ac_cv_header_time_altzone)
if test $ac_cv_header_time_altzone = yes; then
! AC_DEFINE(HAVE_ALTZONE, 1, [Define this if your time.h defines altzone.])
fi

***************
*** 1653,1657 ****
#include <sys/select.h>
#include <sys/time.h>
! ], [;], [AC_DEFINE(SYS_SELECT_WITH_SYS_TIME) was_it_defined=yes])
AC_MSG_RESULT($was_it_defined)

--- 1727,1736 ----
#include <sys/select.h>
#include <sys/time.h>
! ], [;], [.
! AC_DEFINE(SYS_SELECT_WITH_SYS_TIME, 1,
! [.Define if you can safely include both <sys/select.h> and <sys/time.h>
! (which you can't on SCO ODT 3.0).])
! was_it_defined=yes
! ])
AC_MSG_RESULT($was_it_defined)

***************
*** 1665,1669 ****
AC_MSG_RESULT($ac_cv_struct_addrinfo)
if test $ac_cv_struct_addrinfo = yes; then
! AC_DEFINE(HAVE_ADDRINFO)
fi

--- 1744,1748 ----
AC_MSG_RESULT($ac_cv_struct_addrinfo)
if test $ac_cv_struct_addrinfo = yes; then
! AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo (netdb.h)])
fi

***************
*** 1678,1682 ****
AC_MSG_RESULT($ac_cv_struct_sockaddr_storage)
if test $ac_cv_struct_sockaddr_storage = yes; then
! AC_DEFINE(HAVE_SOCKADDR_STORAGE)
fi

--- 1757,1761 ----
AC_MSG_RESULT($ac_cv_struct_sockaddr_storage)
if test $ac_cv_struct_sockaddr_storage = yes; then
! AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)])
fi

***************
*** 1688,1703 ****
works=no
AC_MSG_CHECKING(for working volatile)
! AC_TRY_COMPILE([],[volatile int x; x = 0;], works=yes, AC_DEFINE(volatile, []))
AC_MSG_RESULT($works)

works=no
AC_MSG_CHECKING(for working signed char)
! AC_TRY_COMPILE([], [signed char c;], works=yes, AC_DEFINE(signed, []))
AC_MSG_RESULT($works)

have_prototypes=no
AC_MSG_CHECKING(for prototypes)
! AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
! AC_DEFINE(HAVE_PROTOTYPES) have_prototypes=yes)
AC_MSG_RESULT($have_prototypes)

--- 1767,1789 ----
works=no
AC_MSG_CHECKING(for working volatile)
! AC_TRY_COMPILE([],[volatile int x; x = 0;], works=yes,
! AC_DEFINE(volatile, [], [Define to empty if the keyword does not work.])
! )
AC_MSG_RESULT($works)

works=no
AC_MSG_CHECKING(for working signed char)
! AC_TRY_COMPILE([], [signed char c;], works=yes,
! AC_DEFINE(signed, [], [Define to empty if the keyword does not work.])
! )
AC_MSG_RESULT($works)

have_prototypes=no
AC_MSG_CHECKING(for prototypes)
! AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],[.
! AC_DEFINE(HAVE_PROTOTYPES, 1,
! [Define if your compiler supports function prototype])
! have_prototypes=yes
! ])
AC_MSG_RESULT($have_prototypes)

***************
*** 1714,1719 ****
return 0;
}
! ], [return foo(10, "", 3.14);],
! AC_DEFINE(HAVE_STDARG_PROTOTYPES) works=yes)
AC_MSG_RESULT($works)

--- 1800,1809 ----
return 0;
}
! ], [return foo(10, "", 3.14);], [.
! AC_DEFINE(HAVE_STDARG_PROTOTYPES, 1,
! [.Define if your compiler supports variable length function prototypes
! (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h>])
! works=yes
! ])
AC_MSG_RESULT($works)

***************
*** 1722,1726 ****
AC_MSG_CHECKING(for bad exec* prototypes)
AC_TRY_COMPILE([#include <unistd.h>], [char **t;execve("@",t,t);], ,
! AC_DEFINE(BAD_EXEC_PROTOTYPES) bad_prototypes=yes)
AC_MSG_RESULT($bad_prototypes)
fi
--- 1812,1820 ----
AC_MSG_CHECKING(for bad exec* prototypes)
AC_TRY_COMPILE([#include <unistd.h>], [char **t;execve("@",t,t);], ,
! AC_DEFINE(BAD_EXEC_PROTOTYPES, 1,
! [.Define if your <unistd.h> contains bad prototypes for exec*()
! (as it does on SGI IRIX 4.x)])
! bad_prototypes=yes
! )
AC_MSG_RESULT($bad_prototypes)
fi
***************
*** 1733,1737 ****
x.sa_len = 0;],
AC_MSG_RESULT(yes)
! AC_DEFINE(HAVE_SOCKADDR_SA_LEN),
AC_MSG_RESULT(no))

--- 1827,1831 ----
x.sa_len = 0;],
AC_MSG_RESULT(yes)
! AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if sockaddr has sa_len member]),
AC_MSG_RESULT(no))

***************
*** 1756,1760 ****
if test "$ac_cv_bad_static_forward" = yes
then
! AC_DEFINE(BAD_STATIC_FORWARD)
fi

--- 1850,1856 ----
if test "$ac_cv_bad_static_forward" = yes
then
! AC_DEFINE(BAD_STATIC_FORWARD, 1,
! [.Define if your compiler botches static forward declarations
! (as it does on SCI ODT 3.0)])
fi

***************
*** 1767,1772 ****
#include <varargs.h>
#endif
! ], [va_list list1, list2; list1 = list2;], ,
! AC_DEFINE(VA_LIST_IS_ARRAY) va_list_is_array=yes)
AC_MSG_RESULT($va_list_is_array)

--- 1863,1870 ----
#include <varargs.h>
#endif
! ], [va_list list1, list2; list1 = list2;], , [.
! AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if a va_list is an array of some kind])
! va_list_is_array=yes
! ])
AC_MSG_RESULT($va_list_is_array)

***************
*** 1789,1793 ****
], [
AC_DEFINE(HAVE_GETHOSTBYNAME_R)
! AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARG)
AC_MSG_RESULT(yes)
], [
--- 1887,1892 ----
], [
AC_DEFINE(HAVE_GETHOSTBYNAME_R)
! AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARG, 1,
! [Define this if you have the 6-arg version of gethostbyname_r().])
AC_MSG_RESULT(yes)
], [
***************
*** 1806,1810 ****
], [
AC_DEFINE(HAVE_GETHOSTBYNAME_R)
! AC_DEFINE(HAVE_GETHOSTBYNAME_R_5_ARG)
AC_MSG_RESULT(yes)
], [
--- 1905,1910 ----
], [
AC_DEFINE(HAVE_GETHOSTBYNAME_R)
! AC_DEFINE(HAVE_GETHOSTBYNAME_R_5_ARG, 1,
! [Define this if you have the 5-arg version of gethostbyname_r().])
AC_MSG_RESULT(yes)
], [
***************
*** 1821,1825 ****
], [
AC_DEFINE(HAVE_GETHOSTBYNAME_R)
! AC_DEFINE(HAVE_GETHOSTBYNAME_R_3_ARG)
AC_MSG_RESULT(yes)
], [
--- 1921,1926 ----
], [
AC_DEFINE(HAVE_GETHOSTBYNAME_R)
! AC_DEFINE(HAVE_GETHOSTBYNAME_R_3_ARG, 1,
! [Define this if you have the 3-arg version of gethostbyname_r().])
AC_MSG_RESULT(yes)
], [
***************
*** 1852,1856 ****
[ --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],
--- 1953,1960 ----
[ --with-fpectl enable SIGFPE catching], [
if test "$withval" != no
! then
! AC_DEFINE(WANT_SIGFPE_HANDLER, 1,
! [Define if you want SIGFPE handled (see Include/pyfpe.h).])
! AC_MSG_RESULT(yes)
else AC_MSG_RESULT(no)
fi],
***************
*** 1921,1930 ****
if test "$ac_cv_malloc_zero" = null
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"
)
--- 2025,2038 ----
if test "$ac_cv_malloc_zero" = null
then
! AC_DEFINE(MALLOC_ZERO_RETURNS_NULL, 1,
! [Define if malloc(0) returns a NULL pointer.])
fi

# check for wchar.h
! AC_CHECK_HEADER(wchar.h, [.
! AC_DEFINE(HAVE_WCHAR_H, 1,
! [Define if the compiler provides a wchar.h header file.])
! wchar_h="yes"
! ],
wchar_h="no"
)
***************
*** 1962,1970 ****
else
UNICODE_OBJS="Objects/unicodeobject.o Objects/unicodectype.o"
! AC_DEFINE(Py_USING_UNICODE)
if test "$unicode_size" = "$ac_cv_sizeof_wchar_t"
then
PY_UNICODE_TYPE="wchar_t"
! AC_DEFINE(HAVE_USABLE_WCHAR_T)
AC_DEFINE(PY_UNICODE_TYPE,wchar_t)
elif test "$ac_cv_sizeof_short" = "$unicode_size"
--- 2070,2082 ----
else
UNICODE_OBJS="Objects/unicodeobject.o Objects/unicodectype.o"
! 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)
elif test "$ac_cv_sizeof_short" = "$unicode_size"
***************
*** 2001,2005 ****
if test "$ac_cv_rshift_extends_sign" = no
then
! AC_DEFINE(SIGNED_RIGHT_SHIFT_ZERO_FILLS)
fi

--- 2113,2119 ----
if test "$ac_cv_rshift_extends_sign" = no
then
! AC_DEFINE(SIGNED_RIGHT_SHIFT_ZERO_FILLS, 1,
! [.Define if i>>j for signed int i does not extend the sign bit
! when i < 0])
fi

***************
*** 2016,2029 ****
if test "$ac_cv_have_getc_unlocked" = yes
then
! AC_DEFINE(HAVE_GETC_UNLOCKED)
fi

# check for readline 4.0
AC_CHECK_LIB(readline, rl_pre_input_hook,
! AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK), , -ltermcap)

# check for readline 4.2
AC_CHECK_LIB(readline, rl_completion_matches,
! AC_DEFINE(HAVE_RL_COMPLETION_MATCHES), , -ltermcap)

AC_MSG_CHECKING(for broken nice())
--- 2130,2146 ----
if test "$ac_cv_have_getc_unlocked" = yes
then
! AC_DEFINE(HAVE_GETC_UNLOCKED, 1,
! [Define this if you have flockfile(), getc_unlocked(), and funlockfile()])
fi

# check for readline 4.0
AC_CHECK_LIB(readline, rl_pre_input_hook,
! AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
! [Define if you have readline 4.0]), , -ltermcap)

# check for readline 4.2
AC_CHECK_LIB(readline, rl_completion_matches,
! AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1,
! [Define if you have readline 4.2]), , -ltermcap)

AC_MSG_CHECKING(for broken nice())
***************
*** 2044,2048 ****
if test "$ac_cv_broken_nice" = yes
then
! AC_DEFINE(HAVE_BROKEN_NICE)
fi

--- 2161,2166 ----
if test "$ac_cv_broken_nice" = yes
then
! AC_DEFINE(HAVE_BROKEN_NICE, 1,
! [Define if nice() returns success/failure instead of the new priority.])
fi

***************
*** 2060,2064 ****
if test "$ac_cv_mvwdelch_is_expression" = yes
then
! AC_DEFINE(MVWDELCH_IS_EXPRESSION)
fi

--- 2178,2183 ----
if test "$ac_cv_mvwdelch_is_expression" = yes
then
! AC_DEFINE(MVWDELCH_IS_EXPRESSION, 1,
! [Define if mvwdelch in curses.h is an expression.])
fi

***************
*** 2076,2080 ****
if test "$ac_cv_window_has_flags" = yes
then
! AC_DEFINE(WINDOW_HAS_FLAGS)
fi

--- 2195,2200 ----
if test "$ac_cv_window_has_flags" = yes
then
! AC_DEFINE(WINDOW_HAS_FLAGS, 1,
! [Define if WINDOW in curses.h offers a field _flags.])
fi


Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** pyconfig.h.in 27 Mar 2002 18:49:02 -0000 1.25
--- pyconfig.h.in 6 Apr 2002 10:10:49 -0000 1.26
***************
*** 76,198 ****
#undef WORDS_BIGENDIAN

- /* Define for AIX if your compiler is a genuine IBM xlC/xlC_r
- and you want support for AIX C++ shared extension modules. */
- #undef AIX_GENUINE_CPLUSPLUS
-
- /* Define if your <unistd.h> contains bad prototypes for exec*()
- (as it does on SGI IRIX 4.x) */
- #undef BAD_EXEC_PROTOTYPES
-
- /* Define if your compiler botches static forward declarations
- (as it does on SCI ODT 3.0) */
- #undef BAD_STATIC_FORWARD
-
- /* Define this if you have BeOS threads */
- #undef BEOS_THREADS
-
/* Define if you have the Mach cthreads package */
#undef C_THREADS

- /* Define if you are using Mach cthreads under mach / */
- #undef MACH_C_THREADS
-
- /* Define if you are using Mach cthreads directly under /include */
- #undef HURD_C_THREADS
-
- /* Define to `long' if <time.h> doesn't define. */
- #undef clock_t
-
- /* Defined on Solaris to see additional function prototypes. */
- #undef __EXTENSIONS__
-
- /* This must be set to 64 on some systems to enable large file support */
- #undef _FILE_OFFSET_BITS
-
- /* Define if getpgrp() must be called as getpgrp(0). */
- #undef GETPGRP_HAVE_ARG
-
- /* Define if gettimeofday() does not have second (timezone) argument
- This is the case on Motorola V4 (R40V4.2) */
- #undef GETTIMEOFDAY_NO_TZ
-
- /* Define this if your time.h defines altzone */
- #undef HAVE_ALTZONE
-
/* Define if --enable-ipv6 is specified */
#undef ENABLE_IPV6

- /* Define if sockaddr has sa_len member */
- #undef HAVE_SOCKADDR_SA_LEN
-
- /* struct addrinfo (netdb.h) */
- #undef HAVE_ADDRINFO
-
- /* Define if you have the getaddrinfo function. */
- #undef HAVE_GETADDRINFO
-
- /* struct sockaddr_storage (sys/socket.h) */
- #undef HAVE_SOCKADDR_STORAGE
-
- /* Defined when any dynamic module loading is enabled */
- #undef HAVE_DYNAMIC_LOADING
-
- /* Define this if you have flockfile(), getc_unlocked(), and funlockfile() */
- #undef HAVE_GETC_UNLOCKED
-
/* Define this if you have some version of gethostbyname_r() */
#undef HAVE_GETHOSTBYNAME_R

- /* Define this if you have the 3-arg version of gethostbyname_r() */
- #undef HAVE_GETHOSTBYNAME_R_3_ARG
-
- /* Define this if you have the 5-arg version of gethostbyname_r() */
- #undef HAVE_GETHOSTBYNAME_R_5_ARG
-
- /* Define this if you have the 6-arg version of gethostbyname_r() */
- #undef HAVE_GETHOSTBYNAME_R_6_ARG
-
- /* Defined to enable large file support when an off_t is bigger than a long
- and long long is available and at least as big as an off_t. You may need
- to add some flags for configuration and compilation to enable this mode.
- (For Solaris and Linux, the necessary defines are already defined.)
- */
- #undef HAVE_LARGEFILE_SUPPORT
-
- /* Define this if you have the type long long */
- #undef HAVE_LONG_LONG
-
- /* Define if your compiler supports function prototypes */
- #undef HAVE_PROTOTYPES
-
- /* Define if you have GNU PTH threads */
- #undef HAVE_PTH
-
- /* Define if you have readline 4.0 */
- #undef HAVE_RL_PRE_INPUT_HOOK
-
- /* Define if you have readline 4.2 */
- #undef HAVE_RL_COMPLETION_MATCHES
-
- /* Define if your compiler supports variable length function prototypes
- (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */
- #undef HAVE_STDARG_PROTOTYPES
-
- /* Define this if you have the type uintptr_t */
- #undef HAVE_UINTPTR_T
-
- /* 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 the compiler provides a wchar.h header file. */
- #undef HAVE_WCHAR_H
-
- /* This must be defined on some systems to enable large file support */
- #undef _LARGEFILE_SOURCE
-
- /* Define if you want to have a Unicode type. */
- #undef Py_USING_UNICODE
-
/* Define as the integral type used for Unicode representation. */
#undef PY_UNICODE_TYPE
--- 76,88 ----
***************
*** 201,307 ****
#undef Py_UNICODE_SIZE

- /* Define if nice() returns success/failure instead of the new priority. */
- #undef HAVE_BROKEN_NICE
-
- /* Define if malloc(0) returns a NULL pointer */
- #undef MALLOC_ZERO_RETURNS_NULL
-
- /* Define if you have POSIX threads */
- #undef _POSIX_THREADS
-
- /* Define if you want to build an interpreter with many run-time checks */
- #undef Py_DEBUG
-
/* Define to force use of thread-safe errno, h_errno, and other functions */
#undef _REENTRANT

- /* Define if setpgrp() must be called as setpgrp(0, 0). */
- #undef SETPGRP_HAVE_ARG
-
- /* Define to empty if the keyword does not work. */
- #undef signed
-
- /* Define if i>>j for signed int i does not extend the sign bit
- when i < 0
- */
- #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS
-
- /* The number of bytes in an off_t. */
- #undef SIZEOF_OFF_T
-
- /* The number of bytes in a time_t. */
- #undef SIZEOF_TIME_T
-
- /* The number of bytes in a pthread_t. */
- #undef SIZEOF_PTHREAD_T
-
- /* Defined if PTHREAD_SCOPE_SYSTEM supported. */
- #undef PTHREAD_SYSTEM_SCHED_SUPPORTED
-
/* Define to `int' if <sys/types.h> doesn't define. */
#undef socklen_t

- /* Define if you can safely include both <sys/select.h> and <sys/time.h>
- (which you can't on SCO ODT 3.0). */
- #undef SYS_SELECT_WITH_SYS_TIME
-
- /* Define if a va_list is an array of some kind */
- #undef VA_LIST_IS_ARRAY
-
- /* Define to empty if the keyword does not work. */
- #undef volatile
-
- /* Define if you want SIGFPE handled (see Include/pyfpe.h). */
- #undef WANT_SIGFPE_HANDLER
-
- /* 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 compile in cycle garbage collection */
- #undef WITH_CYCLE_GC
-
- /* Define if you want to emulate SGI (IRIX 4) dynamic linking.
- This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
- Sequent Symmetry (Dynix), and Atari ST.
- This requires the "dl-dld" library,
- ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z,
- as well as the "GNU dld" library,
- ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z.
- Don't bother on SunOS 4 or 5, they already have dynamic linking using
- shared libraries */
- #undef WITH_DL_DLD
-
- /* Define if you want to use the new-style (Openstep, Rhapsody, MacOS)
- dynamic linker (dyld) instead of the old-style (NextStep) dynamic
- linker (rld). Dyld is necessary to support frameworks. */
- #undef WITH_DYLD
-
- /* Define if you want to compile in Python-specific mallocs */
- #undef WITH_PYMALLOC
-
- /* Define if you want to produce an OpenStep/Rhapsody framework
- (shared library plus accessory files). */
- #undef WITH_NEXT_FRAMEWORK
-
- /* Define if you want to use MacPython modules on MacOSX in unix-Python */
- #undef USE_TOOLBOX_OBJECT_GLUE
-
- /* 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.
- Don't bother on IRIX 5, it already has dynamic linking using SunOS
- style shared libraries */
- #undef WITH_SGI_DL
-
/* Define if you want to compile in rudimentary thread support */
#undef WITH_THREAD

- /* Define if mvwdelch in curses.h is an expression. */
- #undef MVWDELCH_IS_EXPRESSION
-
- /* Define if WINDOW in curses.h offers a field _flags. */
- #undef WINDOW_HAS_FLAGS
-
/* The number of bytes in a char. */
#undef SIZEOF_CHAR
--- 91,103 ----
***************
*** 765,768 ****
--- 561,768 ----
/* Define if you have the rt library (-lrt). */
#undef HAVE_LIBRT
+
+ /* Defined on Solaris to see additional function prototypes. */
+ #undef __EXTENSIONS__
+
+ /* Define if you want to build an interpreter with many run-time checks. */
+ #undef Py_DEBUG
+
+ /* Define to 'long' if <time.h> doesn't define. */
+ #undef clock_t
+
+ /* This must be defined on some systems to enable large file support. */
+ #undef _LARGEFILE_SOURCE
+
+ /* This must be set to 64 on some systems to enable large file support. */
+ #undef _FILE_OFFSET_BITS
+
+ /* Define this if you have the type long long. */
+ #undef HAVE_LONG_LONG
+
+ /* Define this if you have the type uintptr_t. */
+ #undef HAVE_UINTPTR_T
+
+ /* The number of bytes in an off_t. */
+ #undef SIZEOF_OFF_T
+
+ /* Defined to enable large file support when an off_t is bigger than a long
+ and long long is available and at least as big as an off_t. You may need
+ to add some flags for configuration and compilation to enable this mode.
+ (For Solaris and Linux, the necessary defines are already defined.) */
+ #undef HAVE_LARGEFILE_SUPPORT
+
+ /* The number of bytes in a time_t. */
+ #undef SIZEOF_TIME_T
+
+ /* The number of bytes in a pthread_t. */
+ #undef SIZEOF_PTHREAD_T
+
+ /* Define if you want to use MacPython modules on MacOSX in unix-Python. */
+ #undef USE_TOOLBOX_OBJECT_GLUE
+
+ /* Define if you want to produce an OpenStep/Rhapsody framework
+ (shared library plus accessory files). */
+ #undef WITH_NEXT_FRAMEWORK
+
+ /* Define if you want to use the new-style (Openstep, Rhapsody, MacOS)
+ dynamic linker (dyld) instead of the old-style (NextStep) dynamic
+ linker (rld). Dyld is necessary to support frameworks. */
+ #undef WITH_DYLD
+
+ /* Define for AIX if your compiler is a genuine IBM xlC/xlC_r
+ and you want support for AIX C++ shared extension modules. */
+ #undef AIX_GENUINE_CPLUSPLUS
+
+ /* Define if you are using Mach cthreads directly under /include */
+ #undef HURD_C_THREADS
+
+ /* Define if you are using Mach cthreads under mach / */
+ #undef MACH_C_THREADS
+
+ /* Define if you have GNU PTH threads. */
+ #undef HAVE_PTH
+
+ /* Define this if you have BeOS threads. */
+ #undef BEOS_THREADS
+
+ /* Define if you have POSIX threads,
+ and your system does not define that. */
+ #undef _POSIX_THREADS
+
+ /* Defined if PTHREAD_SCOPE_SYSTEM supported. */
+ #undef PTHREAD_SYSTEM_SCHED_SUPPORTED
+
+ /* Define if you want to compile in cycle garbage collection. */
+ #undef WITH_CYCLE_GC
+
+ /* Define if you want to compile in Python-specific mallocs */
+ #undef WITH_PYMALLOC
+
+ /* 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.
+ Do not bother on IRIX 5, it already has dynamic linking using SunOS
+ style shared libraries */
+ #undef WITH_SGI_DL
+
+ /* Define if you want to emulate SGI (IRIX 4) dynamic linking.
+ This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
+ Sequent Symmetry (Dynix), and Atari ST.
+ This requires the 'dl-dld' library,
+ ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z,
+ as well as the 'GNU dld' library,
+ ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z.
+ Do not bother on SunOS 4 or 5, they already have dynamic linking using
+ shared libraries. */
+ #undef WITH_DL_DLD
+
+ /* Defined when any dynamic module loading is enabled. */
+ #undef HAVE_DYNAMIC_LOADING
+
+ /* Define if getpgrp() must be called as getpgrp(0). */
+ #undef GETPGRP_HAVE_ARG
+
+ /* Define if setpgrp() must be called as setpgrp(0, 0). */
+ #undef SETPGRP_HAVE_ARG
+
+ /* Define if gettimeofday() does not have second (timezone) argument
+ This is the case on Motorola V4 (R40V4.2) */
+ #undef GETTIMEOFDAY_NO_TZ
+
+ /* Define if you have the getaddrinfo function. */
+ #undef HAVE_GETADDRINFO
+
+ /* Define this if your time.h defines altzone. */
+ #undef HAVE_ALTZONE
+
+ /* Define if you can safely include both <sys/select.h> and <sys/time.h>
+ (which you can't on SCO ODT 3.0). */
+ #undef SYS_SELECT_WITH_SYS_TIME
+
+ /* struct addrinfo (netdb.h) */
+ #undef HAVE_ADDRINFO
+
+ /* struct sockaddr_storage (sys/socket.h) */
+ #undef HAVE_SOCKADDR_STORAGE
+
+ /* Define to empty if the keyword does not work. */
+ #undef volatile
+
+ /* Define to empty if the keyword does not work. */
+ #undef signed
+
+ /* Define if your compiler supports function prototype */
+ #undef HAVE_PROTOTYPES
+
+ /* Define if your compiler supports variable length function prototypes
+ (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */
+ #undef HAVE_STDARG_PROTOTYPES
+
+ /* Define if your <unistd.h> contains bad prototypes for exec*()
+ (as it does on SGI IRIX 4.x) */
+ #undef BAD_EXEC_PROTOTYPES
+
+ /* Define if sockaddr has sa_len member */
+ #undef HAVE_SOCKADDR_SA_LEN
+
+ /* Define if your compiler botches static forward declarations
+ (as it does on SCI ODT 3.0) */
+ #undef BAD_STATIC_FORWARD
+
+ /* Define if a va_list is an array of some kind */
+ #undef VA_LIST_IS_ARRAY
+
+ /* Define this if you have the 6-arg version of gethostbyname_r(). */
+ #undef HAVE_GETHOSTBYNAME_R_6_ARG
+
+ /* Define this if you have the 5-arg version of gethostbyname_r(). */
+ #undef HAVE_GETHOSTBYNAME_R_5_ARG
+
+ /* Define this if you have the 3-arg version of gethostbyname_r(). */
+ #undef HAVE_GETHOSTBYNAME_R_3_ARG
+
+ /* Define if you want SIGFPE handled (see Include/pyfpe.h). */
+ #undef WANT_SIGFPE_HANDLER
+
+ /* Define if malloc(0) returns a NULL pointer. */
+ #undef MALLOC_ZERO_RETURNS_NULL
+
+ /* Define if the compiler provides a wchar.h header file. */
+ #undef HAVE_WCHAR_H
+
+ /* Define if you want to have a Unicode type. */
+ #undef Py_USING_UNICODE
+
+ /* 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 i>>j for signed int i does not extend the sign bit
+ when i < 0 */
+ #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS
+
+ /* Define this if you have flockfile(), getc_unlocked(), and funlockfile() */
+ #undef HAVE_GETC_UNLOCKED
+
+ /* Define if you have readline 4.0 */
+ #undef HAVE_RL_PRE_INPUT_HOOK
+
+ /* Define if you have readline 4.2 */
+ #undef HAVE_RL_COMPLETION_MATCHES
+
+ /* Define if nice() returns success/failure instead of the new priority. */
+ #undef HAVE_BROKEN_NICE
+
+ /* Define if mvwdelch in curses.h is an expression. */
+ #undef MVWDELCH_IS_EXPRESSION
+
+ /* Define if WINDOW in curses.h offers a field _flags. */
+ #undef WINDOW_HAS_FLAGS
+

#ifdef __CYGWIN__
Re: CVS: python/dist/src acconfig.h,1.59,1.60 configure,1.293,1.294 configure.in,1.303,1.304 pyconfig.h.in,1.25,1.26 [ In reply to ]
> Move autoheader declarations into configure.in.

Very cool. What autoconf feature was it that we weren't using enough?

Can you explain how you obtained the set of symbols that remain in
acconfig.h? (Appended)

--Guido van Rossum (home page: http://www.python.org/~guido/)

/* Leave this blank line here -- autoheader needs it! */


/* Define if you have the Mach cthreads package */
#undef C_THREADS

/* Define if --enable-ipv6 is specified */
#undef ENABLE_IPV6

/* Define this if you have gethostbyname() */
#undef HAVE_GETHOSTBYNAME

/* Define this if you have some version of gethostbyname_r() */
#undef HAVE_GETHOSTBYNAME_R

/* Define if you have termios available */
#undef HAVE_TERMIOS_H

/* Define as the integral type used for Unicode representation. */
#undef PY_UNICODE_TYPE

/* Define as the size of the unicode type. */
#undef Py_UNICODE_SIZE

/* Define to force use of thread-safe errno, h_errno, and other functions */
#undef _REENTRANT

/* sizeof(void *) */
#undef SIZEOF_VOID_P

/* Define to `int' if <sys/types.h> doesn't define. */
#undef socklen_t

/* Define for SOLARIS 2.x */
#undef SOLARIS

/* Define if you want to use BSD db. */
#undef WITH_LIBDB

/* Define if you want to use ndbm. */
#undef WITH_LIBNDBM

/* Define if you want to compile in rudimentary thread support */
#undef WITH_THREAD


/* Leave that blank line there-- autoheader needs it! */

@BOTTOM@

#ifdef __CYGWIN__
#ifdef USE_DL_IMPORT
#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
#else
#define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE
#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
#endif
#endif

/* Define the macros needed if on a UnixWare 7.x system. */
#if defined(__USLC__) && defined(__SCO_VERSION__)
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
#endif
Re: CVS: python/dist/src acconfig.h,1.59,1.60 configure,1.293,1.294 configure.in,1.303,1.304 pyconfig.h.in,1.25,1.26 [ In reply to ]
[resend, email from me to sf bounces.]

> Move autoheader declarations into configure.in.

Very cool. What autoconf feature was it that we weren't using enough?

Can you explain how you obtained the set of symbols that remain in
acconfig.h? (Appended)

--Guido van Rossum (home page: http://www.python.org/~guido/)

/* Leave this blank line here -- autoheader needs it! */


/* Define if you have the Mach cthreads package */
#undef C_THREADS

/* Define if --enable-ipv6 is specified */
#undef ENABLE_IPV6

/* Define this if you have gethostbyname() */
#undef HAVE_GETHOSTBYNAME

/* Define this if you have some version of gethostbyname_r() */
#undef HAVE_GETHOSTBYNAME_R

/* Define if you have termios available */
#undef HAVE_TERMIOS_H

/* Define as the integral type used for Unicode representation. */
#undef PY_UNICODE_TYPE

/* Define as the size of the unicode type. */
#undef Py_UNICODE_SIZE

/* Define to force use of thread-safe errno, h_errno, and other functions */
#undef _REENTRANT

/* sizeof(void *) */
#undef SIZEOF_VOID_P

/* Define to `int' if <sys/types.h> doesn't define. */
#undef socklen_t

/* Define for SOLARIS 2.x */
#undef SOLARIS

/* Define if you want to use BSD db. */
#undef WITH_LIBDB

/* Define if you want to use ndbm. */
#undef WITH_LIBNDBM

/* Define if you want to compile in rudimentary thread support */
#undef WITH_THREAD


/* Leave that blank line there-- autoheader needs it! */

@BOTTOM@

#ifdef __CYGWIN__
#ifdef USE_DL_IMPORT
#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
#else
#define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE
#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
#endif
#endif

/* Define the macros needed if on a UnixWare 7.x system. */
#if defined(__USLC__) && defined(__SCO_VERSION__)
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
#endif
Re: CVS: python/dist/src acconfig.h,1.59,1.60 configure,1.293,1.294 configure.in,1.303,1.304 pyconfig.h.in,1.25,1.26 [ In reply to ]
Guido van Rossum <guido@python.org> writes:

> > Move autoheader declarations into configure.in.
>
> Very cool. What autoconf feature was it that we weren't using enough?

AC_DEFINE has an optional third argument which is the docstring. If
that is filled out, autoheader won't complain if it is not in
acconfig.h, and put the macro into pyconfig.h.in properly.

> Can you explain how you obtained the set of symbols that remain in
> acconfig.h? (Appended)

I think they fall into three categories:

- More than one AC_DEFINE. autoheader will continue to complain that
there is no template. This is the problem for most of them. Possible
solutions:
a) arrange that there is only a single AC_DEFINE, conditional upon
some variable.
b) Use AH_TEMPLATE. This allows to specify the template in
configure.in; multiple AC_DEFINEs can then refer to a single
template. This is only available in autoconf 2.5x

- Not referenced in configure.in. I haven't checked whether they are
all used.

- The part below @BOTTOM. It may be sensible to put it into pyport.h.
Alternatively, autoconf 2.5x offers AH_BOTTOM.

It would be easiest to rewrite this to use the autoconf 2.5x features,
then kill acconfig.h. A solution that continues to work with 2.13
might be possible, but require more work (and I'd like to bump
AC_PREREQ at the end, so that the Debian wrapper correctly knows what
autoconf to invoke).

Regards,
Martin
Re: CVS: python/dist/src acconfig.h,1.59,1.60 configure,1.293,1.294 configure.in,1.303,1.304 pyconfig.h.in,1.25,1.26 [ In reply to ]
Thanks for the explanation!

> It would be easiest to rewrite this to use the autoconf 2.5x features,
> then kill acconfig.h. A solution that continues to work with 2.13
> might be possible, but require more work (and I'd like to bump
> AC_PREREQ at the end, so that the Debian wrapper correctly knows what
> autoconf to invoke).

As long as it fails cleanly with older versions of autoconf, I'm all
for using autoconf 2.53 now.

--Guido van Rossum (home page: http://www.python.org/~guido/)
Re: CVS: python/dist/src acconfig.h,1.59,1.60 configure,1.293,1.294 configure.in,1.303,1.304 pyconfig.h.in,1.25,1.26 [ In reply to ]
Guido van Rossum <guido@python.org> writes:

> As long as it fails cleanly with older versions of autoconf, I'm all
> for using autoconf 2.53 now.

Done. At the moment, AC_PREREQ is 2.50, so 2.13 will fail. Even the
changes between 2.52 and 2.53 in the generated configure are huge, so
2.53 should be the "official" version.

This could be done in two ways:
- allow people to continue to use, say, 2.52, and just ask that 2.53
is used when committing; or
- bump AC_PREREQ to 2.53; 2.52 (and earlier) will then refuse to work.
It's your choice.

The other issue is caching: autoconf 2.50 will, by default, not
generate a config.cache, since that has caused too many problems.
Again, two options:
- leave it as-is, and suggest that people who want caching use the -C
option of configure (new in 2.5x), or
- hack configure to create a cache file by default (I'm not sure how
to do this)

Regards,
Martin
Re: CVS: python/dist/src acconfig.h,1.59,1.60 configure,1.293,1.294 configure.in,1.303,1.304 pyconfig.h.in,1.25,1.26 [ In reply to ]
Martin> At the moment, AC_PREREQ is 2.50, so 2.13 will fail. Even the
Martin> changes between 2.52 and 2.53 in the generated configure are
Martin> huge, so 2.53 should be the "official" version.

FWIW, I just bumped from 2.52 to 2.53 locally because I couldn't get the
configure script generated by 2.52 to work in several instances (in a Debian
system where the directory was NFS mounted using the user-space NFS daemon,
for example). When I was trying to debug the problem, people on the
autoconf mailing list suggested there are problems w.r.t. unfsd.

Skip