[Python-checkins] python/dist/src configure,1.279.6.18,1.279.6.19 configure.in,1.288.6.18,1.288.6.19
nnorwitz@users.sourceforge.net
nnorwitz@users.sourceforge.net
2003年3月29日 14:25:25 -0800
Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25959
Modified Files:
Tag: release22-maint
configure configure.in
Log Message:
Backport Patch 659834 checked in by GvR on 2002年12月30日 16:25:38
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
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.279.6.18
retrieving revision 1.279.6.19
diff -C2 -d -r1.279.6.18 -r1.279.6.19
*** configure 23 Feb 2003 23:34:32 -0000 1.279.6.18
--- configure 29 Mar 2003 22:25:14 -0000 1.279.6.19
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.288.6.17
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.288.6.18
# Guess values for system-dependent variables and create Makefiles.
***************
*** 7308,7314 ****
fi
# check for readline 4.0
echo $ac_n "checking for rl_pre_input_hook in -lreadline""... $ac_c" 1>&6
! echo "configure:7313: checking for rl_pre_input_hook in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_pre_input_hook | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 7308,7353 ----
fi
+ # check for readline 2.2
+ cat > conftest.$ac_ext <<EOF
+ #line 7313 "configure"
+ #include "confdefs.h"
+ #include <readline/readline.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:7318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+ have_readline=yes
+ else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ have_readline=no
+ fi
+ rm -f conftest*
+ if test $have_readline = yes
+ then
+ cat > conftest.$ac_ext <<EOF
+ #line 7334 "configure"
+ #include "confdefs.h"
+ #include <readline/readline.h>
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "extern int rl_completion_append_character;" >/dev/null 2>&1; then
+ rm -rf conftest*
+ cat >> confdefs.h <<\EOF
+ #define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
+ EOF
+
+ fi
+ rm -f conftest*
+
+ fi
+
# check for readline 4.0
echo $ac_n "checking for rl_pre_input_hook in -lreadline""... $ac_c" 1>&6
! echo "configure:7352: checking for rl_pre_input_hook in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_pre_input_hook | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 7318,7322 ****
LIBS="-lreadline -ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 7321 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 7357,7361 ----
LIBS="-lreadline -ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 7360 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 7329,7333 ****
; return 0; }
EOF
! if { (eval echo configure:7332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 7368,7372 ----
; return 0; }
EOF
! if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 7355,7359 ****
# check for readline 4.2
echo $ac_n "checking for rl_completion_matches in -lreadline""... $ac_c" 1>&6
! echo "configure:7358: checking for rl_completion_matches in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_completion_matches | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 7394,7398 ----
# check for readline 4.2
echo $ac_n "checking for rl_completion_matches in -lreadline""... $ac_c" 1>&6
! echo "configure:7397: checking for rl_completion_matches in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_completion_matches | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 7363,7367 ****
LIBS="-lreadline -ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 7366 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 7402,7406 ----
LIBS="-lreadline -ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 7405 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 7374,7378 ****
; return 0; }
EOF
! if { (eval echo configure:7377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 7413,7417 ----
; return 0; }
EOF
! if { (eval echo configure:7416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 7399,7403 ****
echo $ac_n "checking for broken nice()""... $ac_c" 1>&6
! echo "configure:7402: checking for broken nice()" >&5
if eval "test \"`echo '$''{'ac_cv_broken_nice'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 7438,7442 ----
echo $ac_n "checking for broken nice()""... $ac_c" 1>&6
! echo "configure:7441: checking for broken nice()" >&5
if eval "test \"`echo '$''{'ac_cv_broken_nice'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7408,7412 ****
else
cat > conftest.$ac_ext <<EOF
! #line 7411 "configure"
#include "confdefs.h"
--- 7447,7451 ----
else
cat > conftest.$ac_ext <<EOF
! #line 7450 "configure"
#include "confdefs.h"
***************
*** 7420,7424 ****
EOF
! if { (eval echo configure:7423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_broken_nice=yes
--- 7459,7463 ----
EOF
! if { (eval echo configure:7462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_broken_nice=yes
***************
*** 7445,7454 ****
# On HP/UX 11.0, mvwdelch is a block with a return statement
echo $ac_n "checking whether mvwdelch is an expression""... $ac_c" 1>&6
! echo "configure:7448: checking whether mvwdelch is an expression" >&5
if eval "test \"`echo '$''{'ac_cv_mvwdelch_is_expression'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7453 "configure"
#include "confdefs.h"
#include <curses.h>
--- 7484,7493 ----
# On HP/UX 11.0, mvwdelch is a block with a return statement
echo $ac_n "checking whether mvwdelch is an expression""... $ac_c" 1>&6
! echo "configure:7487: checking whether mvwdelch is an expression" >&5
if eval "test \"`echo '$''{'ac_cv_mvwdelch_is_expression'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7492 "configure"
#include "confdefs.h"
#include <curses.h>
***************
*** 7460,7464 ****
; return 0; }
EOF
! if { (eval echo configure:7463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mvwdelch_is_expression=yes
--- 7499,7503 ----
; return 0; }
EOF
! if { (eval echo configure:7502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mvwdelch_is_expression=yes
***************
*** 7483,7492 ****
echo $ac_n "checking whether WINDOW has _flags""... $ac_c" 1>&6
! echo "configure:7486: checking whether WINDOW has _flags" >&5
if eval "test \"`echo '$''{'ac_cv_window_has_flags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7491 "configure"
#include "confdefs.h"
#include <curses.h>
--- 7522,7531 ----
echo $ac_n "checking whether WINDOW has _flags""... $ac_c" 1>&6
! echo "configure:7525: checking whether WINDOW has _flags" >&5
if eval "test \"`echo '$''{'ac_cv_window_has_flags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7530 "configure"
#include "confdefs.h"
#include <curses.h>
***************
*** 7498,7502 ****
; return 0; }
EOF
! if { (eval echo configure:7501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_window_has_flags=yes
--- 7537,7541 ----
; return 0; }
EOF
! if { (eval echo configure:7540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_window_has_flags=yes
***************
*** 7529,7538 ****
EOF
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:7532: checking for socklen_t" >&5
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 7537 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 7568,7577 ----
EOF
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:7571: checking for socklen_t" >&5
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 7576 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 7590,7594 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7593: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 7629,7633 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7632: 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.288.6.18
retrieving revision 1.288.6.19
diff -C2 -d -r1.288.6.18 -r1.288.6.19
*** configure.in 23 Feb 2003 23:34:37 -0000 1.288.6.18
--- configure.in 29 Mar 2003 22:25:17 -0000 1.288.6.19
***************
*** 2013,2016 ****
--- 2013,2027 ----
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,