[Python-checkins] CVS: python/dist/src acconfig.h,1.46,1.46.2.1 config.h.in,2.91.2.1,2.91.2.2 configure,1.207.2.1,1.207.2.2 configure.in,1.215.2.1,1.215.2.2
Thomas Wouters
twouters@users.sourceforge.net
2001年7月11日 05:18:26 -0700
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv6445
Modified Files:
Tag: release21-maint
acconfig.h config.h.in configure configure.in
Log Message:
Backport of Guido's checkins of acconfig.h (1.50), configure.in (1.224) and
readline.c (2.36), and re-generated config.h.in and configure:
SF Patch #432457 by Jason Tishler: support for readline 4.2.
This patch allows the readline module to build cleanly with GNU
readline 4.2 without breaking the build for earlier GNU readline
versions. The configure script checks for the presence of
rl_completion_matches in libreadline.
Index: acconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/acconfig.h,v
retrieving revision 1.46
retrieving revision 1.46.2.1
diff -C2 -r1.46 -r1.46.2.1
*** acconfig.h 2001年03月20日 13:09:13 1.46
--- acconfig.h 2001年07月11日 12:18:23 1.46.2.1
***************
*** 75,78 ****
--- 75,81 ----
#undef HAVE_PTH
+ /* 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> */
Index: config.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/config.h.in,v
retrieving revision 2.91.2.1
retrieving revision 2.91.2.2
diff -C2 -r2.91.2.1 -r2.91.2.2
*** config.h.in 2001年05月11日 16:21:06 2.91.2.1
--- config.h.in 2001年07月11日 12:18:23 2.91.2.2
***************
*** 1,3 ****
! /* config.h.in. Generated automatically from configure.in by autoheader. */
/* Define if on AIX 3.
--- 1,3 ----
! /* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define if on AIX 3.
***************
*** 137,140 ****
--- 137,143 ----
#undef HAVE_PTH
+ /* 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> */
***************
*** 270,273 ****
--- 273,279 ----
#undef SIZEOF_VOID_P
+ /* Define if you have the _getpty function. */
+ #undef HAVE__GETPTY
+
/* Define if you have the alarm function. */
#undef HAVE_ALARM
***************
*** 357,363 ****
#undef HAVE_GETPID
- /* Define if you have the _getpty function. */
- #undef HAVE__GETPTY
-
/* Define if you have the getpwent function. */
#undef HAVE_GETPWENT
--- 363,366 ----
***************
*** 519,530 ****
#undef HAVE_WAITPID
! /* Define if you have the <db_185.h> header file. */
! #undef HAVE_DB_185_H
/* Define if you have the <db1/ndbm.h> header file. */
#undef HAVE_DB1_NDBM_H
! /* Define if you have the <db.h> header file. */
! #undef HAVE_DB_H
/* Define if you have the <dirent.h> header file. */
--- 522,533 ----
#undef HAVE_WAITPID
! /* Define if you have the <db.h> header file. */
! #undef HAVE_DB_H
/* Define if you have the <db1/ndbm.h> header file. */
#undef HAVE_DB1_NDBM_H
! /* Define if you have the <db_185.h> header file. */
! #undef HAVE_DB_185_H
/* Define if you have the <dirent.h> header file. */
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.207.2.1
retrieving revision 1.207.2.2
diff -C2 -r1.207.2.1 -r1.207.2.2
*** configure 2001年05月11日 16:35:03 1.207.2.1
--- configure 2001年07月11日 12:18:23 1.207.2.2
***************
*** 2237,2240 ****
--- 2237,2241 ----
#include "confdefs.h"
#include <stdio.h>
+ #include <sys/types.h>
main()
{
***************
*** 2245,2249 ****
}
EOF
[...3167 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 6232 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 6223,6227 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6226: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 6278,6282 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6281: 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.215.2.1
retrieving revision 1.215.2.2
diff -C2 -r1.215.2.1 -r1.215.2.2
*** configure.in 2001年05月11日 16:21:06 1.215.2.1
--- configure.in 2001年07月11日 12:18:24 1.215.2.2
***************
*** 1331,1334 ****
--- 1331,1338 ----
fi
+ # check for readline 4.2
+ AC_CHECK_LIB(readline, rl_completion_matches,
+ AC_DEFINE(HAVE_RL_COMPLETION_MATCHES), , -ltermcap)
+
# THIS MUST BE LAST, IT CAN BREAK OTHER TESTS!
# Add sys/socket.h to confdefs.h