sniper Fri Nov 18 10:10:34 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/readline config.m4
Log:
MF51: sync all changes
http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.17.4.3&r2=1.17.4.3.4.1&ty=u
Index: php-src/ext/readline/config.m4
diff -u php-src/ext/readline/config.m4:1.17.4.3
php-src/ext/readline/config.m4:1.17.4.3.4.1
--- php-src/ext/readline/config.m4:1.17.4.3 Tue Sep 30 22:54:04 2003
+++ php-src/ext/readline/config.m4 Fri Nov 18 10:10:33 2005
@@ -1,12 +1,14 @@
dnl
-dnl $Id: config.m4,v 1.17.4.3 2003/10/01 02:54:04 sniper Exp $
+dnl $Id: config.m4,v 1.17.4.3.4.1 2005/11/18 15:10:33 sniper Exp $
dnl
PHP_ARG_WITH(libedit,for libedit readline replacement,
-[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI
only).])
+[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI
only)])
-PHP_ARG_WITH(readline,for readline support,
-[ --with-readline[=DIR] Include readline support (CLI/CGI only).])
+if test "$PHP_LIBEDIT" = "no"; then
+ PHP_ARG_WITH(readline,for readline support,
+ [ --with-readline[=DIR] Include readline support (CLI/CGI only)])
+fi
if test "$PHP_READLINE" != "no"; then
for i in $PHP_READLINE /usr/local /usr; do
@@ -19,13 +21,16 @@
PHP_ADD_INCLUDE($READLINE_DIR/include)
+ PHP_READLINE_LIBS=""
AC_CHECK_LIB(ncurses, tgetent,
[
PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
+ PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
],[
AC_CHECK_LIB(termcap, tgetent,
[
PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
+ PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap"
])
])
@@ -35,7 +40,14 @@
], [
AC_MSG_ERROR(readline library not found)
], [
- -L$READLINE_DIR/lib
+ -L$READLINE_DIR/lib $PHP_READLINE_LIBS
+ ])
+
+ PHP_CHECK_LIBRARY(readline, rl_callback_read_char,
+ [
+ AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ])
+ ],[],[
+ -L$READLINE_DIR/lib $PHP_READLINE_LIBS
])
PHP_CHECK_LIBRARY(history, add_history,
@@ -44,7 +56,7 @@
], [
AC_MSG_ERROR(history library required by readline not found)
], [
- -L$READLINE_DIR/lib
+ -L$READLINE_DIR/lib $PHP_READLINE_LIBS
])
PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
