diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-11 10:55:36 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-11 10:55:36 +0100 |
| commit | 894e78b4946b33d1f68d172903962dab1b08c7af (patch) | |
| tree | 5224bdc24584fe4769a4cd39a3f0398b411ff952 | |
| parent | 42cd5db142fe0a17f08c6177ccbdf03e8d7f0c41 (diff) | |
| parent | b35a20e919e8ac2e70bf6e386b948fe5dd860798 (diff) | |
| download | php-git-894e78b4946b33d1f68d172903962dab1b08c7af.tar.gz | |
Merge branch 'PHP-7.3'
| -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 e8c6b91c68..0395835931 100644 --- a/ext/readline/config.m4 +++ b/ext/readline/config.m4 @@ -58,13 +58,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 @@ -112,11 +119,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 |