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

diff --git a/NEWS b/NEWS
index 2353e6c3353759114a2451cfedf11078a639ef2b..8d6a0fc65a8e57b908202bfb27d9babf72e0cc5a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -54,6 +54,8 @@ PHP                                                                        NEWS
 - Fixed bug #48629 (get_defined_constants() ignores categorize parameter).
   (Felipe)
 - Fixed bug #48619 (imap_search ALL segfaults). (Pierre)
+- Fixed bug #48608 (Invalid libreadline version not detected during configure).
+  (Jani)
 - Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts
   with new lines) (Takeshi Abe)
 - Fixed bug #48539 (pdo_dblib fails to connect, throws empty PDOException

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, [ ])