|
Lines 1-5
Link Here
|
| 1 |
--- config.m4.orig 2013-08-20 06:46:43.000000000 +0200 |
1 |
--- config.m4.orig 2018-12-17 16:46:43.000000000 +0200 |
| 2 |
+++ config.m4 2013-08-27 16:01:29.000000000 +0200 |
2 |
+++ config.m4 2019-02-07 16:01:29.000000000 +0200 |
| 3 |
@@ -5,13 +5,8 @@ |
3 |
@@ -5,13 +5,8 @@ |
| 4 |
PHP_ARG_WITH(libedit,for libedit readline replacement, |
4 |
PHP_ARG_WITH(libedit,for libedit readline replacement, |
| 5 |
[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) |
5 |
[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) |
|
Lines 14-38
Link Here
|
| 14 |
|
14 |
|
| 15 |
if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then |
15 |
if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then |
| 16 |
for i in $PHP_READLINE /usr/local /usr; do |
16 |
for i in $PHP_READLINE /usr/local /usr; do |
| 17 |
@@ -67,6 +62,13 @@ |
|
|
| 18 |
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS |
| 19 |
]) |
| 20 |
|
| 21 |
+ PHP_CHECK_LIBRARY(readline, rl_completion_matches, |
| 22 |
+ [ |
| 23 |
+ AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ]) |
| 24 |
+ ],[],[ |
| 25 |
+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS |
| 26 |
+ ]) |
| 27 |
+ |
| 28 |
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) |
| 29 |
|
| 30 |
elif test "$PHP_LIBEDIT" != "no"; then |
| 31 |
@@ -118,7 +120,6 @@ |
| 32 |
fi |
| 33 |
|
| 34 |
if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then |
| 35 |
- AC_CHECK_FUNCS([rl_completion_matches]) |
| 36 |
PHP_NEW_EXTENSION(readline, readline.c readline_cli.c, $ext_shared, cli) |
| 37 |
PHP_SUBST(READLINE_SHARED_LIBADD) |
| 38 |
fi |