[Python-checkins] CVS: python/dist/src PLAN.txt,1.1.2.26,1.1.2.27 acconfig.h,1.46.4.1,1.46.4.2 config.h.in,2.92.2.1,2.92.2.2 configure,1.209.2.1,1.209.2.2 configure.in,1.217.2.1,1.217.2.2

Sat, 14 Jul 2001 00:47:37 -0700

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv29618/descr/dist/src

Modified Files:
      Tag: descr-branch
	PLAN.txt acconfig.h config.h.in configure configure.in 
Log Message:
Merge of trunk tag date2001-07-13 into descr-branch.  See PLAN.txt.

Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Attic/PLAN.txt,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -C2 -r1.1.2.26 -r1.1.2.27
*** PLAN.txt	2001/07/09 01:32:28	1.1.2.26
--- PLAN.txt	2001/07/14 07:47:33	1.1.2.27
***************
*** 269,272 ****
--- 269,289 ----

  ----------------------------------------------------------------------------
+ 2001-07-13
+ 
+ Tagged trunk about 22:13 EDT, like so:
+     cvs tag date2001-07-13 python
+ 
+ Merged trunk delta into branch via:
+     cvs -q -z3 up -j date2001-07-06 -j date2001-07-13 descr
+ 
+ Six(!) files with conflicts, mostly related to NeilS's generator gc patches.
+ Unsure why, but CVS seems always to think there are conflicts whenever a
+ line in a type object decl gets changed, and the conflict marking seems
+ maximally confused in these cases.  Anyway, since I reviewed those patches
+ on the trunk, good thing I'm merging them, and darned glad it's still fresh
+ on my mind.
+ 
+ Resolved the conflicts, and committed the changes in a few hours total.
+ ----------------------------------------------------------------------------
  2001-07-07

Index: acconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/acconfig.h,v
retrieving revision 1.46.4.1
retrieving revision 1.46.4.2
diff -C2 -r1.46.4.1 -r1.46.4.2
*** acconfig.h	2001/07/07 22:55:27	1.46.4.1
--- acconfig.h	2001/07/14 07:47:33	1.46.4.2
***************
*** 87,90 ****
--- 87,93 ----
  #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> */
***************
*** 113,116 ****
--- 116,122 ----
  /* Define as the size of the unicode type. */
  #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 */

Index: config.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/config.h.in,v
retrieving revision 2.92.2.1
retrieving revision 2.92.2.2
diff -C2 -r2.92.2.1 -r2.92.2.2
*** config.h.in	2001/07/07 22:55:27	2.92.2.1
--- config.h.in	2001/07/14 07:47:33	2.92.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.
***************
*** 149,152 ****
--- 149,155 ----
  #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> */
***************
*** 173,176 ****
--- 176,182 ----
  #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
***************
*** 393,396 ****
--- 399,405 ----
  #undef HAVE_GETPID

+ /* Define if you have the getpriority function.  */
+ #undef HAVE_GETPRIORITY
+ 
  /* Define if you have the getpwent function.  */
  #undef HAVE_GETPWENT
***************
*** 635,638 ****
--- 644,650 ----
  /* Define if you have the <sys/param.h> header file.  */
  #undef HAVE_SYS_PARAM_H
+ 
+ /* Define if you have the <sys/resource.h> header file.  */
+ #undef HAVE_SYS_RESOURCE_H

  /* Define if you have the <sys/select.h> header file.  */

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.209.2.1
retrieving revision 1.209.2.2
diff -C2 -r1.209.2.1 -r1.209.2.2
*** configure	2001/07/07 22:55:27	1.209.2.1
--- configure	2001/07/14 07:47:33	1.209.2.2
***************
*** 1,5 ****
  #! /bin/sh

! # From configure.in Revision: 1.222 

  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh

! # From configure.in Revision: 1.226 

[...4338 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 6938 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6877,6881 ****
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6880: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
--- 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

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.217.2.1
retrieving revision 1.217.2.2
diff -C2 -r1.217.2.1 -r1.217.2.2
*** configure.in	2001/07/07 22:55:27	1.217.2.1
--- configure.in	2001/07/14 07:47:34	1.217.2.2
***************
*** 304,307 ****
--- 304,317 ----
  fi

+ # Check for --with-pydebug
+ AC_MSG_CHECKING(for --with-pydebug)
+ AC_ARG_WITH(pydebug, 
+ [  --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],
+ [AC_MSG_RESULT(no)])
+ 
  # Optimizer/debugger flags
  AC_SUBST(OPT)
***************
*** 312,320 ****
  		case $ac_cv_prog_cc_g in
  	yes)
! 	    OPT="-g -O2 -Wall -Wstrict-prototypes";;
  	*)
! 	    OPT="-O2 -Wall -Wstrict-prototypes";;
! 		esac
! 		;;
      *)
  	case $ac_sys_system in
--- 322,336 ----
  		case $ac_cv_prog_cc_g in
  	yes)
! 	    if test "$Py_DEBUG" = 'true' ; then
! 		# Optimization messes up debuggers, so turn it off for
! 		# debug builds.
! 		OPT="-g -Wall -Wstrict-prototypes"
! 	    else
! 		OPT="-g -O3 -Wall -Wstrict-prototypes"
! 	    fi;;
  	*)
! 	    OPT="-O3 -Wall -Wstrict-prototypes";;
! 	esac
! 	;;
      *)
  	case $ac_sys_system in
***************
*** 386,390 ****
    esac ],

!   AC_TRY_RUN([ /* AF_INET6 avalable check */
  #include <sys/types.h>
  #include <sys/socket.h>
--- 402,406 ----
    esac ],

!   AC_TRY_RUN([ /* AF_INET6 available check */
  #include <sys/types.h>
  #include <sys/socket.h>
***************
*** 530,534 ****
  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)
  AC_HEADER_DIRENT

--- 546,550 ----
  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)
  AC_HEADER_DIRENT

***************
*** 862,875 ****
  AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX

- # Check for --with-pydebug
- AC_MSG_CHECKING(for --with-pydebug)
- AC_ARG_WITH(pydebug, 
- [  --with-pydebug                  build with Py_DEBUG defined], [
- if test "$withval" != no
- then AC_DEFINE(Py_DEBUG) AC_MSG_RESULT(yes)
- else AC_MSG_RESULT(no)
- fi],
- [AC_MSG_RESULT(no)])
- 
  # checks for system dependent C++ extensions support
  case "$ac_sys_system" in
--- 878,881 ----
***************
*** 1170,1174 ****
   sigaction siginterrupt sigrelse strftime strptime symlink sysconf \
   tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
!  truncate uname waitpid _getpty)

  # check for openpty and forkpty
--- 1176,1180 ----
   sigaction siginterrupt sigrelse strftime strptime symlink sysconf \
   tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
!  truncate uname waitpid _getpty getpriority)

  # check for openpty and forkpty
***************
*** 1660,1663 ****
--- 1666,1690 ----
  then
    AC_DEFINE(HAVE_GETC_UNLOCKED)
+ fi
+ 
+ # 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())
+ AC_CACHE_VAL(ac_cv_broken_nice, [
+ AC_TRY_RUN([
+ int main()
+ {
+ 	int val1 = nice(1);
+ 	if (val1 != -1 && val1 == nice(2))
+ 		exit(0);
+ 	exit(1);
+ }
+ ],ac_cv_broken_nice=yes, ac_cv_broken_nice=no)])
+ AC_MSG_RESULT($ac_cv_broken_nice)
+ if test "$ac_cv_broken_nice" = yes
+ then
+   AC_DEFINE(HAVE_BROKEN_NICE)
  fi