From 07c8bb9d6cdbdba9ae5320c97a8633b9b5c288e1 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Tue, 4 Aug 2009 11:20:49 +0000 Subject: [PATCH] - Fixed bug #48608 (Invalid libreadline version not detected during configure) --- NEWS | 2 ++ ext/readline/config.m4 | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/NEWS b/NEWS index 2353e6c335..8d6a0fc65a 100644 --- 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 2fb8ca42c3..a320deeb42 100644 --- 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, [ ]) -- 2.40.0