- Fixed bug #48608 (Invalid libreadline version not detected during configure)

diff --git a/NEWS b/NEWS
index 762a9b8df1019248009d7150effe213670a3093c..839566f668cd66229638347a43b374a4af3f75d5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -85,6 +85,8 @@ PHP                                                                        NEWS
   html-entities). (Moriyoshi)
 - Fixed bug #48637 ("file" fopen wrapper is overwritten when using
   --with-curlwrappers). (Jani)
+- Fixed bug #48608 (Invalid libreadline version not detected during configure).
+  (Jani)
 - Fixed bug #48400 (imap crashes when closing stream opened with
   OP_PROTOTYPE flag). (Jani)
 - Fixed bug #48377 (error message unclear on converting phar with existing file).

diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index 2fb8ca42c3bb78ecd70b13ea2e10caad5c352d3a..a320deeb4299dfa124b49e4d20f04423282c33f6 100644 (file)
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -46,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, [ ])