[Python-checkins] CVS: python/dist/src PLAN.txt,1.1.2.27,1.1.2.28 config.h.in,2.92.2.2,2.92.2.3 configure,1.209.2.2,1.209.2.3 configure.in,1.217.2.2,1.217.2.3 setup.py,1.38.4.1,1.38.4.2
Tim Peters
tim_one@users.sourceforge.net
Sun, 15 Jul 2001 13:26:58 -0700
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv4678/descr/dist/src
Modified Files:
Tag: descr-branch
PLAN.txt config.h.in configure configure.in setup.py
Log Message:
Merge trunk tag delta date2001-07-13 to date2001-07-15.
Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Attic/PLAN.txt,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -C2 -r1.1.2.27 -r1.1.2.28
*** PLAN.txt 2001/07/14 07:47:33 1.1.2.27
--- PLAN.txt 2001/07/15 20:26:55 1.1.2.28
***************
*** 269,272 ****
--- 269,283 ----
----------------------------------------------------------------------------
+ 2001-07-15
+
+ Tagged trunk about 15:44 EDT, like so:
+ cvs tag date2001-07-15 python
+
+ Merged trunk delta into branch via:
+ cvs -q -z3 up -j date2001-07-13 -j date2001-07-15 descr
+
+ Four files with conflicts, all artificial RCS Id & Revision thingies.
+ Resolved and committed.
+ ----------------------------------------------------------------------------
2001-07-13
Index: config.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/config.h.in,v
retrieving revision 2.92.2.2
retrieving revision 2.92.2.3
diff -C2 -r2.92.2.2 -r2.92.2.3
*** config.h.in 2001/07/14 07:47:33 2.92.2.2
--- config.h.in 2001/07/15 20:26:55 2.92.2.3
***************
*** 1,3 ****
! /* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define if on AIX 3.
--- 1,3 ----
! /* config.h.in. Generated automatically from configure.in by autoheader. */
/* Define if on AIX 3.
***************
*** 644,647 ****
--- 644,650 ----
/* Define if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
+
+ /* Define if you have the <sys/poll.h> header file. */
+ #undef HAVE_SYS_POLL_H
/* Define if you have the <sys/resource.h> header file. */
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.209.2.2
retrieving revision 1.209.2.3
diff -C2 -r1.209.2.2 -r1.209.2.3
*** configure 2001/07/14 07:47:33 1.209.2.2
--- configure 2001/07/15 20:26:55 1.209.2.3
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.226
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.227
[...3466 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 6927 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 6984,6988 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6987: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 6973,6977 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6976: 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.217.2.2
retrieving revision 1.217.2.3
diff -C2 -r1.217.2.2 -r1.217.2.3
*** configure.in 2001/07/14 07:47:34 1.217.2.2
--- configure.in 2001/07/15 20:26:55 1.217.2.3
***************
*** 544,548 ****
signal.h stdarg.h stddef.h stdlib.h thread.h unistd.h utime.h termios.h \
sys/audioio.h sys/file.h sys/lock.h sys/modem.h db_185.h db.h \
! sys/param.h sys/select.h sys/socket.h sys/time.h sys/times.h \
sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
ndbm.h db1/ndbm.h gdbm/ndbm.h sys/resource.h)
--- 544,548 ----
signal.h stdarg.h stddef.h stdlib.h thread.h unistd.h utime.h termios.h \
sys/audioio.h sys/file.h sys/lock.h sys/modem.h db_185.h db.h \
! sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
ndbm.h db1/ndbm.h gdbm/ndbm.h sys/resource.h)
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.38.4.1
retrieving revision 1.38.4.2
diff -C2 -r1.38.4.1 -r1.38.4.2
*** setup.py 2001/07/07 22:55:27 1.38.4.1
--- setup.py 2001/07/15 20:26:55 1.38.4.2
***************
*** 117,121 ****
# compilers
if compiler is not None:
! args['compiler_so'] = compiler
if linker_so is not None:
args['linker_so'] = linker_so + ' -shared'
--- 117,122 ----
# compilers
if compiler is not None:
! (ccshared,) = sysconfig.get_config_vars('CCSHARED')
! args['compiler_so'] = compiler + ' ' + ccshared
if linker_so is not None:
args['linker_so'] = linker_so + ' -shared'