Skip to content

Commit a72b632

Browse files
committed
Address review comments
1 parent a0caa1f commit a72b632

File tree

2 files changed

+64
-57
lines changed

2 files changed

+64
-57
lines changed

configure

+27-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

+37-41
Original file line numberDiff line numberDiff line change
@@ -5792,7 +5792,6 @@ dnl library (tinfo ncursesw ncurses termcap). We now assume that libreadline
57925792
dnl or readline.pc provide correct linker information.
57935793

57945794
AH_TEMPLATE([WITH_EDITLINE], [Define to build the readline module against libedit.])
5795-
py_cv_lib_readline=no
57965795

57975796
AC_ARG_WITH(
57985797
[readline],
@@ -5811,15 +5810,13 @@ AC_ARG_WITH(
58115810

58125811
AS_VAR_IF([with_readline], [readline], [
58135812
PKG_CHECK_MODULES([LIBREADLINE], [readline], [
5814-
py_cv_lib_readline=yes
58155813
LIBREADLINE=readline
58165814
READLINE_CFLAGS=$LIBREADLINE_CFLAGS
58175815
READLINE_LIBS=$LIBREADLINE_LIBS
58185816
], [
58195817
AC_CHECK_HEADERS([readline/readline.h], [
58205818
WITH_SAVE_ENV([
58215819
AC_CHECK_LIB([readline], [readline], [
5822-
py_cv_lib_readline=yes
58235820
LIBREADLINE=readline
58245821
READLINE_CFLAGS=${LIBREADLINE_CFLAGS-""}
58255822
READLINE_LIBS=${LIBREADLINE_LIBS-"-lreadline"}
@@ -5834,15 +5831,13 @@ AS_VAR_IF([with_readline], [readline], [
58345831
AS_VAR_IF([with_readline], [edit], [
58355832
PKG_CHECK_MODULES([LIBEDIT], [libedit], [
58365833
AC_DEFINE([WITH_EDITLINE], [1])
5837-
py_cv_lib_readline=yes
58385834
LIBREADLINE=edit
58395835
READLINE_CFLAGS=$LIBEDIT_CFLAGS
58405836
READLINE_LIBS=$LIBEDIT_LIBS
58415837
], [
58425838
AC_CHECK_HEADERS([editline/readline.h], [
58435839
WITH_SAVE_ENV([
58445840
AC_CHECK_LIB([edit], [readline], [
5845-
py_cv_lib_readline=yes
58465841
LIBREADLINE=edit
58475842
AC_DEFINE([WITH_EDITLINE], [1])
58485843
READLINE_CFLAGS=${LIBEDIT_CFLAGS-""}
@@ -5856,78 +5851,79 @@ AS_VAR_IF([with_readline], [edit], [
58565851
])
58575852

58585853
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], [
58625855
AC_MSG_RESULT([no])
5863-
])
5856+
], [
5857+
AC_MSG_RESULT([$with_readline (CFLAGS: $READLINE_CFLAGS, LIBS: $READLINE_LIBS)])
58645858
5865-
AS_VAR_IF([py_cv_lib_readline], [yes], [
58665859
WITH_SAVE_ENV([
58675860
CPPFLAGS="$READLINE_CFLAGS $CFLAGS"
58685861
LIBS="$READLINE_LIBS $LIBS"
5862+
LIBS_SAVE=$LIBS
58695863
58705864
# 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+
], [], [
58755868
#include <stdio.h> /* Must be first for Gnu Readline */
58765869
#ifdef WITH_EDITLINE
58775870
# include <editline/readline.h>
58785871
#else
58795872
# include <readline/readline.h>
58805873
#endif
5881-
])
5874+
])
58825875
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+
], [], [
58875879
#include <stdio.h> /* Must be first for Gnu Readline */
58885880
#ifdef WITH_EDITLINE
58895881
# include <editline/readline.h>
58905882
#else
58915883
# include <readline/readline.h>
58925884
#endif
5893-
])
5885+
])
58945886
58955887
# 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
58995892
59005893
# 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
59045898
59055899
# 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
59095904
59105905
# 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
59145910
59155911
# 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+
], [], [
59205915
#include <stdio.h> /* Must be first for Gnu Readline */
59215916
#ifdef WITH_EDITLINE
59225917
# include <editline/readline.h>
59235918
#else
59245919
# include <readline/readline.h>
59255920
#endif
5926-
])
5921+
])
59275922
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
59315927
59325928
])dnl WITH_SAVE_ENV()
59335929
])
@@ -7144,7 +7140,7 @@ PY_STDLIB_MOD([nis],
71447140
[], [test "$have_nis" = yes -a "$ac_cv_header_rpc_rpc_h" = yes],
71457141
[$LIBNSL_CFLAGS], [$LIBNSL_LIBS])
71467142
PY_STDLIB_MOD([readline],
7147-
[], [test "$py_cv_lib_readline" = "yes"],
7143+
[], [test "$with_readline" != "no"],
71487144
[$READLINE_CFLAGS], [$READLINE_LIBS])
71497145
PY_STDLIB_MOD([_sqlite3],
71507146
[test "$have_sqlite3" = "yes"],

0 commit comments

Comments
 (0)