svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/readline/config.m4 branches/PHP_5_4/ext/readline/readline.c trunk/ext/readline/config.m4
trunk/ext/readline/readline.c

bjori Tue, 06 Sep 2011 15:07:24 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=316265 Log: Fixed bug#54450 (callback function when built against libedit) Bug: https://bugs.php.net/54450 (Assigned) Missing functions with libedit Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/ext/readline/config.m4 U php/php-src/branches/PHP_5_4/ext/readline/readline.c U php/php-src/trunk/ext/readline/config.m4 U php/php-src/trunk/ext/readline/readline.c Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2011-09-06 14:48:43 UTC (rev 316264) +++ php/php-src/branches/PHP_5_4/NEWS 2011-09-06 15:07:24 UTC (rev 316265) @@ -38,6 +38,10 @@ - Improved CLI SAPI: . Added friendly log messages - Req #55109 (Arpad) +- Improved readline extension: + . Fixed bug #54450 (Enable callback support when built against libedit). + (fedora at famillecollet dot com, Hannes) + - Improved Session extension: . Expose session status via new function, session_status (Req #52982) (Arpad) Modified: php/php-src/branches/PHP_5_4/ext/readline/config.m4 =================================================================== --- php/php-src/branches/PHP_5_4/ext/readline/config.m4 2011-09-06 14:48:43 UTC (rev 316264) +++ php/php-src/branches/PHP_5_4/ext/readline/config.m4 2011-09-06 15:07:24 UTC (rev 316265) @@ -60,6 +60,13 @@ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) + PHP_CHECK_LIBRARY(edit, rl_on_new_line, + [ + AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ]) + ],[],[ + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS + ]) + AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) elif test "$PHP_LIBEDIT" != "no"; then @@ -93,6 +100,20 @@ -L$READLINE_DIR/$PHP_LIBDIR ]) + PHP_CHECK_LIBRARY(edit, rl_callback_read_char, + [ + AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) + ],[],[ + -L$READLINE_DIR/$PHP_LIBDIR + ]) + + PHP_CHECK_LIBRARY(edit, rl_on_new_line, + [ + AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ]) + ],[],[ + -L$READLINE_DIR/$PHP_LIBDIR + ]) + AC_DEFINE(HAVE_LIBEDIT, 1, [ ]) fi Modified: php/php-src/branches/PHP_5_4/ext/readline/readline.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/readline/readline.c 2011-09-06 14:48:43 UTC (rev 316264) +++ php/php-src/branches/PHP_5_4/ext/readline/readline.c 2011-09-06 15:07:24 UTC (rev 316265) @@ -144,6 +144,8 @@ PHP_FE(readline_callback_read_char, arginfo_readline_callback_read_char) PHP_FE(readline_callback_handler_remove, arginfo_readline_callback_handler_remove) PHP_FE(readline_redisplay, arginfo_readline_redisplay) +#endif +#if HAVE_RL_ON_NEW_LINE PHP_FE(readline_on_new_line, arginfo_readline_on_new_line) #endif PHP_FE_END @@ -617,6 +619,9 @@ } /* }}} */ +#endif + +#if HAVE_RL_ON_NEW_LINE /* {{{ proto void readline_on_new_line(void) Inform readline that the cursor has moved to a new line */ PHP_FUNCTION(readline_on_new_line) Modified: php/php-src/trunk/ext/readline/config.m4 =================================================================== --- php/php-src/trunk/ext/readline/config.m4 2011-09-06 14:48:43 UTC (rev 316264) +++ php/php-src/trunk/ext/readline/config.m4 2011-09-06 15:07:24 UTC (rev 316265) @@ -60,6 +60,13 @@ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) + PHP_CHECK_LIBRARY(edit, rl_on_new_line, + [ + AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ]) + ],[],[ + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS + ]) + AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) elif test "$PHP_LIBEDIT" != "no"; then @@ -93,6 +100,20 @@ -L$READLINE_DIR/$PHP_LIBDIR ]) + PHP_CHECK_LIBRARY(edit, rl_callback_read_char, + [ + AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) + ],[],[ + -L$READLINE_DIR/$PHP_LIBDIR + ]) + + PHP_CHECK_LIBRARY(edit, rl_on_new_line, + [ + AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ]) + ],[],[ + -L$READLINE_DIR/$PHP_LIBDIR + ]) + AC_DEFINE(HAVE_LIBEDIT, 1, [ ]) fi Modified: php/php-src/trunk/ext/readline/readline.c =================================================================== --- php/php-src/trunk/ext/readline/readline.c 2011-09-06 14:48:43 UTC (rev 316264) +++ php/php-src/trunk/ext/readline/readline.c 2011-09-06 15:07:24 UTC (rev 316265) @@ -144,6 +144,8 @@ PHP_FE(readline_callback_read_char, arginfo_readline_callback_read_char) PHP_FE(readline_callback_handler_remove, arginfo_readline_callback_handler_remove) PHP_FE(readline_redisplay, arginfo_readline_redisplay) +#endif +#if HAVE_RL_ON_NEW_LINE PHP_FE(readline_on_new_line, arginfo_readline_on_new_line) #endif PHP_FE_END @@ -617,6 +619,9 @@ } /* }}} */ +#endif + +#if HAVE_RL_ON_NEW_LINE /* {{{ proto void readline_on_new_line(void) Inform readline that the cursor has moved to a new line */ PHP_FUNCTION(readline_on_new_line)