[Python-checkins] python/dist/src configure.in,1.379,1.380 configure,1.368,1.369 pyconfig.h.in,1.65,1.66

2002年12月30日 08:25:44 -0800

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13946
Modified Files:
	configure.in configure pyconfig.h.in 
Log Message:
Patch 659834 by Magnus Lie Hetland:
Check for readline 2.2 features. This should make it possible to
compile readline.c again with GNU readline versions 2.0 or 2.1; this
ability was removed in readline.c rev. 2.49. Apparently the older
versions are still in widespread deployment on older Solaris
installations. With an older readline, completion behavior is subtly
different (a space is always added).
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.379
retrieving revision 1.380
diff -C2 -d -r1.379 -r1.380
*** configure.in	27 Dec 2002 10:16:42 -0000	1.379
--- configure.in	30 Dec 2002 16:25:38 -0000	1.380
***************
*** 2382,2385 ****
--- 2382,2396 ----
 fi
 
+ # check for readline 2.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_completion_append_character;],
+ [readline/readline.h],
+ AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
+ [Define if you have readline 2.2]), )
+ fi
+ 
 # check for readline 4.0
 AC_CHECK_LIB(readline, rl_pre_input_hook,
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.368
retrieving revision 1.369
diff -C2 -d -r1.368 -r1.369
*** configure	27 Dec 2002 10:16:40 -0000	1.368
--- configure	30 Dec 2002 16:25:39 -0000	1.369
***************
*** 1,4 ****
 #! /bin/sh
! # From configure.in Revision: 1.378 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53 for python 2.3.
--- 1,4 ----
 #! /bin/sh
! # From configure.in Revision: 1.380 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53 for python 2.3.
***************
*** 909,913 ****
 # absolute.
 ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
 ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
 ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--- 909,913 ----
 # absolute.
 ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
 ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
 ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
***************
*** 16229,16232 ****
--- 16229,16282 ----
 fi
 
+ # check for readline 2.2
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ #include <readline/readline.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+ else
+ ac_cpp_err=yes
+ fi
+ if test -z "$ac_cpp_err"; then
+ have_readline=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ have_readline=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ if test $have_readline = yes
+ then
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ #include <readline/readline.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "extern int rl_completion_append_character;" >/dev/null 2>&1; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
+ _ACEOF
+ 
+ fi
+ rm -f conftest*
+ 
+ fi
+ 
 # check for readline 4.0
 echo "$as_me:$LINENO: checking for rl_pre_input_hook in -lreadline" >&5
***************
*** 17419,17423 ****
 # absolute.
 ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
 ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
 ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--- 17469,17473 ----
 # absolute.
 ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
 ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
 ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** pyconfig.h.in	27 Dec 2002 10:16:42 -0000	1.65
--- pyconfig.h.in	30 Dec 2002 16:25:41 -0000	1.66
***************
*** 334,337 ****
--- 334,340 ----
 #undef HAVE_READLINK
 
+ /* Define if you have readline 2.2 */
+ #undef HAVE_RL_COMPLETION_APPEND_CHARACTER
+ 
 /* Define if you have readline 4.2 */
 #undef HAVE_RL_COMPLETION_MATCHES