summaryrefslogtreecommitdiff
path: root/ext/readline/config.m4
diff options
context:
space:
mode:
Diffstat (limited to 'ext/readline/config.m4')
-rw-r--r--ext/readline/config.m412
1 files changed, 11 insertions, 1 deletions
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index df111424b..00875c0d6 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.3.4.1 2009/05/14 13:40:51 jani Exp $
+dnl $Id: config.m4 286797 2009-08-04 11:20:49Z jani $
dnl
PHP_ARG_WITH(libedit,for libedit readline replacement,
@@ -8,6 +8,9 @@ PHP_ARG_WITH(libedit,for libedit readline replacement,
if test "$PHP_LIBEDIT" = "no"; then
PHP_ARG_WITH(readline,for readline support,
[ --with-readline[=DIR] Include readline support (CLI/CGI only)])
+else
+ dnl "register" the --with-readline option to preven invalid "unknown configure option" warning
+ php_with_readline=no
fi
if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
@@ -43,6 +46,13 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
])
+ PHP_CHECK_LIBRARY(readline, rl_pending_input,
+ [], [
+ AC_MSG_ERROR([invalid readline installation detected. Try --with-libedit instead.])
+ ], [
+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
+ ])
+
PHP_CHECK_LIBRARY(readline, rl_callback_read_char,
[
AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ])