Changeset View
Changeset View
Standalone View
Standalone View
devel/php74-readline/files/patch-config.m4
| --- config.m4.orig 2019-02-05 13:10:04 UTC | --- config.m4.orig 2019-08-06 06:54:14 UTC | ||||
| +++ config.m4 | +++ config.m4 | ||||
| @@ -3,13 +3,8 @@ dnl config.m4 for extension readline | @@ -3,16 +3,10 @@ PHP_ARG_WITH([libedit], | ||||
| PHP_ARG_WITH(libedit,for libedit readline replacement, | [AS_HELP_STRING([--with-libedit], | ||||
| [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) | [Include libedit readline replacement (CLI/CGI only)])]) | ||||
| -if test "$PHP_LIBEDIT" = "no"; then | -if test "$PHP_LIBEDIT" = "no"; then | ||||
| PHP_ARG_WITH(readline,for readline support, | PHP_ARG_WITH([readline], | ||||
| [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) | [for readline support], | ||||
| [AS_HELP_STRING([[--with-readline[=DIR]]], | |||||
| [Include readline support (CLI/CGI only)])]) | |||||
| -else | -else | ||||
| - dnl "register" the --with-readline option to preven invalid "unknown configure option" warning | - dnl "register" the --with-readline option to prevent invalid "unknown | ||||
| - dnl configure option" warning | |||||
| - php_with_readline=no | - php_with_readline=no | ||||
| -fi | -fi | ||||
| if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then | if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then | ||||
| for i in $PHP_READLINE /usr/local /usr; do | for i in $PHP_READLINE /usr/local /usr; do | ||||
| @@ -72,6 +67,13 @@ if test "$PHP_READLINE" && test "$PHP_RE | @@ -78,6 +72,13 @@ if test "$PHP_READLINE" && test "$PHP_RE | ||||
| -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS | AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ]) | ||||
| ]) | AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) | ||||
| + PHP_CHECK_LIBRARY(readline, rl_completion_matches, | + PHP_CHECK_LIBRARY(readline, rl_completion_matches, | ||||
| + [ | + [ | ||||
| Context not available. | |||||
| + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS | + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS | ||||
| + ]) | + ]) | ||||
| + | + | ||||
| AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) | |||||
| elif test "$PHP_LIBEDIT" != "no"; then | elif test "$PHP_LIBEDIT" != "no"; then | ||||
| if test "$PHP_LIBEDIT" != "yes"; then | |||||
| AC_MSG_WARN([libedit directory ignored, rely on pkg-config]) | |||||
| Context not available. | |||||