[Python-checkins] python/dist/src acconfig.h,1.60,1.61 configure,1.294,1.295 configure.in,1.304,1.305 pyconfig.h.in,1.26,1.27
loewis@sourceforge.net
loewis@sourceforge.net
Fri, 12 Apr 2002 02:54:11 -0700
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv17974
Modified Files:
acconfig.h configure configure.in pyconfig.h.in
Log Message:
Update to autoconf 2.5x.
Index: acconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/acconfig.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** acconfig.h 6 Apr 2002 10:10:47 -0000 1.60
--- acconfig.h 12 Apr 2002 09:54:01 -0000 1.61
***************
*** 2,29 ****
- /* 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
--- 2,14 ----
***************
*** 41,65 ****
#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
--- 26,32 ----
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.294
retrieving revision 1.295
diff -C2 -d -r1.294 -r1.295
*** configure 6 Apr 2002 10:10:48 -0000 1.294
--- configure 12 Apr 2002 09:54:01 -0000 1.295
***************
*** 1,74 ****
#! /bin/sh
!
! # From configure.in Revision: 1.303
!
# Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.13
! # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
[...23335 lines suppressed...]
!
! # configure is writing to config.log, and then calls config.status.
! # config.status does its own redirection, appending to config.log.
! # Unfortunately, on DOS this fails, as config.log is still kept open
! # by configure, so config.status won't be able to write to it; its
! # output is simply discarded. So we exec the FD to /dev/null,
! # effectively closing config.log, so it can be properly (re)opened and
! # appended to by config.status. When coming back to configure, we
! # need to make the FD available again.
! 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
! # would make configure fail if this is the last instruction.
! $ac_cs_success || { (exit 1); exit 1; }
! fi
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.304
retrieving revision 1.305
diff -C2 -d -r1.304 -r1.305
*** configure.in 6 Apr 2002 10:10:49 -0000 1.304
--- configure.in 12 Apr 2002 09:54:03 -0000 1.305
***************
*** 1,8 ****
dnl Process this file with autoconf 2.0 or later to make a configure script.
AC_REVISION($Revision$)
! AC_PREREQ(2.0)
AC_INIT(Include/object.h)
AC_CONFIG_HEADER(pyconfig.h)
# Set VERSION so we only need to edit in one place (i.e., here)
AC_SUBST(VERSION)
--- 1,27 ----
dnl Process this file with autoconf 2.0 or later to make a configure script.
AC_REVISION($Revision$)
! AC_PREREQ(2.50)
AC_INIT(Include/object.h)
AC_CONFIG_HEADER(pyconfig.h)
+ # This is for stuff that absolutely must end up in pyconfig.h.
+ # Please use pyport.h instead, if possible.
+ AH_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
+ ])
+
# Set VERSION so we only need to edit in one place (i.e., here)
AC_SUBST(VERSION)
***************
*** 1066,1069 ****
--- 1085,1096 ----
AC_MSG_RESULT(no))
+ # Templates for things AC_DEFINEd more than once.
+ # For a single AC_DEFINE, no template is needed.
+ AH_TEMPLATE(C_THREADS,[Define if you have the Mach cthreads package])
+ AH_TEMPLATE(_REENTRANT,
+ [Define to force use of thread-safe errno, h_errno, and other functions])
+ AH_TEMPLATE(WITH_THREAD,
+ [Define if you want to compile in rudimentary thread support])
+
AC_MSG_CHECKING(for --with-threads)
AC_ARG_WITH(threads,
***************
*** 1238,1241 ****
--- 1265,1269 ----
# Check for enable-ipv6
+ AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
AC_MSG_CHECKING([if --enable-ipv6 is specified])
AC_ARG_ENABLE(ipv6,
***************
*** 1870,1873 ****
--- 1898,1904 ----
# sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments :-(
+ AH_TEMPLATE(HAVE_GETHOSTBYNAME_R,
+ [Define this if you have some version of gethostbyname_r()])
+
AC_CHECK_FUNC(gethostbyname_r, [
AC_DEFINE(HAVE_GETHOSTBYNAME_R)
***************
*** 2063,2066 ****
--- 2094,2099 ----
esac
+ AH_TEMPLATE(PY_UNICODE_TYPE,
+ [Define as the integral type used for Unicode representation.])
AC_SUBST(UNICODE_OBJS)
if test "$enable_unicode" = "no"
Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** pyconfig.h.in 6 Apr 2002 10:10:49 -0000 1.26
--- pyconfig.h.in 12 Apr 2002 09:54:03 -0000 1.27
***************
*** 1,78 ****
! /* pyconfig.h.in. Generated automatically from configure.in by autoheader. */
!
! /* Define if on AIX 3.
! System headers sometimes define this.
! We just want to avoid a redefinition error message. */
! #ifndef _ALL_SOURCE
! #undef _ALL_SOURCE
! #endif
!
! /* Define if type char is unsigned and you are not using gcc. */
[...1584 lines suppressed...]
! /* Define to `unsigned' if <sys/types.h> does not define. */
! #undef size_t
! /* Define to `int' if <sys/types.h> does not define. */
! #undef socklen_t
! /* Define to `int' if <sys/types.h> doesn't define. */
! #undef uid_t
! /* Define to empty if the keyword does not work. */
! #undef volatile
***************
*** 780,782 ****
--- 855,858 ----
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
#endif
+