[Python-checkins] python/dist/src configure, 1.449, 1.450 configure.in, 1.460, 1.461 pyconfig.h.in, 1.99, 1.100

mwh at users.sourceforge.net mwh at users.sourceforge.net
Wed Jul 7 19:44:13 CEST 2004


Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18275

Modified Files:
	configure configure.in pyconfig.h.in 
Log Message:
This closes patch:

[ 960406 ] unblock signals in threads

although the changes do not correspond exactly to any patch attached to
that report.

Non-main threads no longer have all signals masked.

A different interface to readline is used.

The handling of signals inside calls to PyOS_Readline is now rather 
different.

These changes are all a bit scary!  Review and cross-platform testing
much appreciated.



Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.449
retrieving revision 1.450
diff -C2 -d -r1.449 -r1.450
*** configure	25 Jun 2004 23:30:56 -0000	1.449
--- configure	7 Jul 2004 17:44:03 -0000	1.450
***************
*** 1,8 ****
  #! /bin/sh
! # From configure.in Revision: 1.459 .
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59 for python 2.4.
  #
! # Copyright (C) 2003 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
--- 1,9 ----
  #! /bin/sh
[...12726 lines suppressed...]
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
***************
*** 21003,21010 ****
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! 	 X"$as_dir" : 'X\(//\)[^/]' \| \
! 	 X"$as_dir" : 'X\(//\)$' \| \
! 	 X"$as_dir" : 'X\(/\)' \| \
! 	 .     : '\(.\)' 2>/dev/null ||
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--- 19354,19361 ----
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
!          X"$as_dir" : 'X\(//\)[^/]' \| \
!          X"$as_dir" : 'X\(//\)$' \| \
!          X"$as_dir" : 'X\(/\)' \| \
!          .     : '\(.\)' 2>/dev/null ||
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.460
retrieving revision 1.461
diff -C2 -d -r1.460 -r1.461
*** configure.in	25 Jun 2004 23:31:05 -0000	1.460
--- configure.in	7 Jul 2004 17:44:09 -0000	1.461
***************
*** 2784,2787 ****
--- 2784,2792 ----
  fi
  
+ # check for readline 2.1
+ AC_CHECK_LIB(readline, rl_callback_handler_install,
+ 	AC_DEFINE(HAVE_RL_CALLBACK, 1,
+         [Define if you have readline 2.1]), , -ltermcap)
+ 
  # check for readline 2.2
  AC_TRY_CPP([#include <readline/readline.h>],
***************
*** 2805,2808 ****
--- 2810,2824 ----
          [Define if you have readline 4.2]), , -ltermcap)
  
+ # also in readline 4.2
+ AC_TRY_CPP([#include <readline/readline.h>],
+ have_readline=yes, have_readline=no)
+ if test $have_readline = yes
+ then
+   AC_EGREP_HEADER([extern int rl_catch_signals;],
+   [readline/readline.h],
+   AC_DEFINE(HAVE_RL_CATCH_SIGNAL, 1,
+   [Define if you can turn off readline's signal handling.]), )
+ fi
+ 
  AC_MSG_CHECKING(for broken nice())
  AC_CACHE_VAL(ac_cv_broken_nice, [

Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** pyconfig.h.in	25 Jun 2004 23:31:05 -0000	1.99
--- pyconfig.h.in	7 Jul 2004 17:44:09 -0000	1.100
***************
*** 360,363 ****
--- 360,369 ----
  #undef HAVE_REALPATH
  
+ /* Define if you have readline 2.1 */
+ #undef HAVE_RL_CALLBACK
+ 
+ /* Define if you can turn off readline's signal handling. */
+ #undef HAVE_RL_CATCH_SIGNAL
+ 
  /* Define if you have readline 2.2 */
  #undef HAVE_RL_COMPLETION_APPEND_CHARACTER



More information about the Python-checkins mailing list