@@ -5792,7 +5792,6 @@ dnl library (tinfo ncursesw ncurses termcap). We now assume that libreadline
5792
5792
dnl or readline.pc provide correct linker information.
5793
5793
5794
5794
AH_TEMPLATE ( [ WITH_EDITLINE] , [ Define to build the readline module against libedit.] )
5795
- py_cv_lib_readline=no
5796
5795
5797
5796
AC_ARG_WITH (
5798
5797
[ readline] ,
@@ -5811,15 +5810,13 @@ AC_ARG_WITH(
5811
5810
5812
5811
AS_VAR_IF ( [ with_readline] , [ readline] , [
5813
5812
PKG_CHECK_MODULES([ LIBREADLINE] , [ readline] , [
5814
- py_cv_lib_readline=yes
5815
5813
LIBREADLINE=readline
5816
5814
READLINE_CFLAGS=$LIBREADLINE_CFLAGS
5817
5815
READLINE_LIBS=$LIBREADLINE_LIBS
5818
5816
] , [
5819
5817
AC_CHECK_HEADERS ( [ readline/readline.h] , [
5820
5818
WITH_SAVE_ENV([
5821
5819
AC_CHECK_LIB ( [ readline] , [ readline] , [
5822
- py_cv_lib_readline=yes
5823
5820
LIBREADLINE=readline
5824
5821
READLINE_CFLAGS=${LIBREADLINE_CFLAGS-""}
5825
5822
READLINE_LIBS=${LIBREADLINE_LIBS-"-lreadline"}
@@ -5834,15 +5831,13 @@ AS_VAR_IF([with_readline], [readline], [
5834
5831
AS_VAR_IF ( [ with_readline] , [ edit] , [
5835
5832
PKG_CHECK_MODULES([ LIBEDIT] , [ libedit] , [
5836
5833
AC_DEFINE ( [ WITH_EDITLINE] , [ 1] )
5837
- py_cv_lib_readline=yes
5838
5834
LIBREADLINE=edit
5839
5835
READLINE_CFLAGS=$LIBEDIT_CFLAGS
5840
5836
READLINE_LIBS=$LIBEDIT_LIBS
5841
5837
] , [
5842
5838
AC_CHECK_HEADERS ( [ editline/readline.h] , [
5843
5839
WITH_SAVE_ENV([
5844
5840
AC_CHECK_LIB ( [ edit] , [ readline] , [
5845
- py_cv_lib_readline=yes
5846
5841
LIBREADLINE=edit
5847
5842
AC_DEFINE ( [ WITH_EDITLINE] , [ 1] )
5848
5843
READLINE_CFLAGS=${LIBEDIT_CFLAGS-""}
@@ -5856,78 +5851,79 @@ AS_VAR_IF([with_readline], [edit], [
5856
5851
] )
5857
5852
5858
5853
AC_MSG_CHECKING ( [ how to link readline] )
5859
- AS_VAR_IF ( [ py_cv_lib_readline] , [ yes] , [
5860
- AC_MSG_RESULT ( [ $with_readline (CFLAGS: $READLINE_CFLAGS, LIBS: $READLINE_LIBS)] )
5861
- ] , [
5854
+ AS_VAR_IF ( [ with_readline] , [ no] , [
5862
5855
AC_MSG_RESULT ( [ no] )
5863
- ] )
5856
+ ] , [
5857
+ AC_MSG_RESULT ( [ $with_readline (CFLAGS: $READLINE_CFLAGS, LIBS: $READLINE_LIBS)] )
5864
5858
5865
- AS_VAR_IF ( [ py_cv_lib_readline] , [ yes] , [
5866
5859
WITH_SAVE_ENV([
5867
5860
CPPFLAGS="$READLINE_CFLAGS $CFLAGS"
5868
5861
LIBS="$READLINE_LIBS $LIBS"
5862
+ LIBS_SAVE=$LIBS
5869
5863
5870
5864
# check for readline 2.2
5871
- AC_CHECK_DECL ( rl_completion_append_character ,
5872
- AC_DEFINE ( HAVE_RL_COMPLETION_APPEND_CHARACTER , 1 ,
5873
- [ Define if you have readline 2.2] ) ,,
5874
- [
5865
+ AC_CHECK_DECL ( [ rl_completion_append_character] , [
5866
+ AC_DEFINE ( [ HAVE_RL_COMPLETION_APPEND_CHARACTER] , [ 1] , [ Define if you have readline 2.2] )
5867
+ ] , [ ] , [
5875
5868
#include <stdio.h> /* Must be first for Gnu Readline */
5876
5869
#ifdef WITH_EDITLINE
5877
5870
# include <editline/readline.h>
5878
5871
#else
5879
5872
# include <readline/readline.h>
5880
5873
#endif
5881
- ] )
5874
+ ] )
5882
5875
5883
- AC_CHECK_DECL ( rl_completion_suppress_append ,
5884
- AC_DEFINE ( HAVE_RL_COMPLETION_SUPPRESS_APPEND , 1 ,
5885
- [ Define if you have rl_completion_suppress_append] ) ,,
5886
- [
5876
+ AC_CHECK_DECL ( [ rl_completion_suppress_append] , [
5877
+ AC_DEFINE ( [ HAVE_RL_COMPLETION_SUPPRESS_APPEND] , [ 1] , [ Define if you have rl_completion_suppress_append] )
5878
+ ] , [ ] , [
5887
5879
#include <stdio.h> /* Must be first for Gnu Readline */
5888
5880
#ifdef WITH_EDITLINE
5889
5881
# include <editline/readline.h>
5890
5882
#else
5891
5883
# include <readline/readline.h>
5892
5884
#endif
5893
- ] )
5885
+ ] )
5894
5886
5895
5887
# check for readline 4.0
5896
- AC_CHECK_LIB ( $LIBREADLINE , rl_pre_input_hook ,
5897
- AC_DEFINE ( HAVE_RL_PRE_INPUT_HOOK , 1 ,
5898
- [ Define if you have readline 4.0] ) )
5888
+ AC_CHECK_LIB ( [ $LIBREADLINE] , [ rl_pre_input_hook] , [
5889
+ AC_DEFINE ( [ HAVE_RL_PRE_INPUT_HOOK] , [ 1] , [ Define if you have readline 4.0] )
5890
+ ] )
5891
+ LIBS=$LIBS_SAVE
5899
5892
5900
5893
# also in 4.0
5901
- AC_CHECK_LIB ( $LIBREADLINE , rl_completion_display_matches_hook ,
5902
- AC_DEFINE ( HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK , 1 ,
5903
- [ Define if you have readline 4.0] ) )
5894
+ AC_CHECK_LIB ( [ $LIBREADLINE] , [ rl_completion_display_matches_hook] , [
5895
+ AC_DEFINE ( [ HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK] , [ 1] , [ Define if you have readline 4.0] )
5896
+ ] )
5897
+ LIBS=$LIBS_SAVE
5904
5898
5905
5899
# also in 4.0, but not in editline
5906
- AC_CHECK_LIB ( $LIBREADLINE , rl_resize_terminal ,
5907
- AC_DEFINE ( HAVE_RL_RESIZE_TERMINAL , 1 ,
5908
- [ Define if you have readline 4.0] ) )
5900
+ AC_CHECK_LIB ( [ $LIBREADLINE] , [ rl_resize_terminal] , [
5901
+ AC_DEFINE ( [ HAVE_RL_RESIZE_TERMINAL] , [ 1] , [ Define if you have readline 4.0] )
5902
+ ] )
5903
+ LIBS=$LIBS_SAVE
5909
5904
5910
5905
# check for readline 4.2
5911
- AC_CHECK_LIB ( $LIBREADLINE , rl_completion_matches ,
5912
- AC_DEFINE ( HAVE_RL_COMPLETION_MATCHES , 1 ,
5913
- [ Define if you have readline 4.2] ) )
5906
+ AC_CHECK_LIB ( [ $LIBREADLINE] , [ rl_completion_matches] , [
5907
+ AC_DEFINE ( [ HAVE_RL_COMPLETION_MATCHES] , [ 1] , [ Define if you have readline 4.2] )
5908
+ ] )
5909
+ LIBS=$LIBS_SAVE
5914
5910
5915
5911
# also in readline 4.2
5916
- AC_CHECK_DECL ( rl_catch_signals ,
5917
- AC_DEFINE ( HAVE_RL_CATCH_SIGNAL , 1 ,
5918
- [ Define if you can turn off readline's signal handling.] ) ,,
5919
- [
5912
+ AC_CHECK_DECL ( [ rl_catch_signals] , [
5913
+ AC_DEFINE ( [ HAVE_RL_CATCH_SIGNAL] , [ 1] , [ Define if you can turn off readline's signal handling.] )
5914
+ ] , [ ] , [
5920
5915
#include <stdio.h> /* Must be first for Gnu Readline */
5921
5916
#ifdef WITH_EDITLINE
5922
5917
# include <editline/readline.h>
5923
5918
#else
5924
5919
# include <readline/readline.h>
5925
5920
#endif
5926
- ] )
5921
+ ] )
5927
5922
5928
- AC_CHECK_LIB ( $LIBREADLINE , append_history ,
5929
- AC_DEFINE ( HAVE_RL_APPEND_HISTORY , 1 ,
5930
- [ Define if readline supports append_history] ) )
5923
+ AC_CHECK_LIB ( [ $LIBREADLINE] , [ append_history] , [
5924
+ AC_DEFINE ( [ HAVE_RL_APPEND_HISTORY] , [ 1] , [ Define if readline supports append_history] )
5925
+ ] )
5926
+ LIBS=$LIBS_SAVE
5931
5927
5932
5928
] )dnl WITH_SAVE_ENV()
5933
5929
] )
@@ -7144,7 +7140,7 @@ PY_STDLIB_MOD([nis],
7144
7140
[ ] , [ test "$have_nis" = yes -a "$ac_cv_header_rpc_rpc_h" = yes] ,
7145
7141
[ $LIBNSL_CFLAGS] , [ $LIBNSL_LIBS] )
7146
7142
PY_STDLIB_MOD([ readline] ,
7147
- [ ] , [ test "$py_cv_lib_readline" = "yes "] ,
7143
+ [ ] , [ test "$with_readline" ! = "no "] ,
7148
7144
[ $READLINE_CFLAGS] , [ $READLINE_LIBS] )
7149
7145
PY_STDLIB_MOD([ _sqlite3] ,
7150
7146
[ test "$have_sqlite3" = "yes"] ,
0 commit comments