diff options
author | Ondřej Surý <ondrej@sury.org> | 2018-12-17 09:56:06 +0000 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-11 10:55:07 +0100 |
commit | 1ea58b6e78355437b79fb7b1f287ba6688fb1c57 (patch) | |
tree | ad6161bce374f3c2f041557455ca1ae205ba91bd /ext | |
parent | 332b58f86591548acd5965c7f7f0085af377f0d9 (diff) | |
download | php-git-1ea58b6e78355437b79fb7b1f287ba6688fb1c57.tar.gz |
Fix rl_completion_matches detection
Also fix a typo when checking for rl_on_new_line in readline library.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/readline/config.m4 | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4 index d63df8bef9..3995bd7587 100644 --- a/ext/readline/config.m4 +++ b/ext/readline/config.m4 @@ -60,13 +60,20 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) - PHP_CHECK_LIBRARY(edit, rl_on_new_line, + PHP_CHECK_LIBRARY(readline, rl_on_new_line, [ AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ]) ],[],[ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) + PHP_CHECK_LIBRARY(readline, rl_completion_matches, + [ + AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ]) + ],[],[ + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS + ]) + AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) elif test "$PHP_LIBEDIT" != "no"; then @@ -114,11 +121,17 @@ elif test "$PHP_LIBEDIT" != "no"; then -L$READLINE_DIR/$PHP_LIBDIR ]) + PHP_CHECK_LIBRARY(edit, rl_completion_matches, + [ + AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ]) + ],[],[ + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS + ]) + AC_DEFINE(HAVE_LIBEDIT, 1, [ ]) fi if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then - AC_CHECK_FUNCS([rl_completion_matches]) PHP_NEW_EXTENSION(readline, readline.c readline_cli.c, $ext_shared, cli) PHP_SUBST(READLINE_SHARED_LIBADD) fi |