jani Tue, 04 Aug 2009 11:20:49 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286797
Log: - Fixed bug #48608 (Invalid libreadline version not detected during configure) Bug: http://bugs.php.net/48608 (Assigned) Invalid libreadline version not detected during configure Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/readline/config.m4 U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/readline/config.m4 U php/php-src/trunk/ext/readline/config.m4 Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-08-04 11:19:07 UTC (rev 286796) +++ php/php-src/branches/PHP_5_2/NEWS 2009-08-04 11:20:49 UTC (rev 286797) @@ -54,6 +54,8 @@ - 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 Modified: php/php-src/branches/PHP_5_2/ext/readline/config.m4 =================================================================== --- php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-08-04 11:19:07 UTC (rev 286796) +++ php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-08-04 11:20:49 UTC (rev 286797) @@ -46,6 +46,13 @@ -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, [ ]) Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-08-04 11:19:07 UTC (rev 286796) +++ php/php-src/branches/PHP_5_3/NEWS 2009-08-04 11:20:49 UTC (rev 286797) @@ -85,6 +85,8 @@ 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). Modified: php/php-src/branches/PHP_5_3/ext/readline/config.m4 =================================================================== --- php/php-src/branches/PHP_5_3/ext/readline/config.m4 2009-08-04 11:19:07 UTC (rev 286796) +++ php/php-src/branches/PHP_5_3/ext/readline/config.m4 2009-08-04 11:20:49 UTC (rev 286797) @@ -46,6 +46,13 @@ -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, [ ]) Modified: php/php-src/trunk/ext/readline/config.m4 =================================================================== --- php/php-src/trunk/ext/readline/config.m4 2009-08-04 11:19:07 UTC (rev 286796) +++ php/php-src/trunk/ext/readline/config.m4 2009-08-04 11:20:49 UTC (rev 286797) @@ -46,6 +46,13 @@ -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, [ ])
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
