sniper Mon Feb 10 22:24:30 2003 EDT
Modified files:
/php4/ext/readline config.m4
Log:
- There's no point in allowing using both --with-readline and --with-libedit
the same time. Prefer --with-readline.
- Use PHP_ADD_LIBRARY when there is no path available.
Index: php4/ext/readline/config.m4
diff -u php4/ext/readline/config.m4:1.17 php4/ext/readline/config.m4:1.18
--- php4/ext/readline/config.m4:1.17 Wed Aug 21 20:34:07 2002
+++ php4/ext/readline/config.m4 Mon Feb 10 22:24:30 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.17 2002/08/22 00:34:07 sniper Exp $
+dnl $Id: config.m4,v 1.18 2003/02/11 03:24:30 sniper Exp $
dnl
PHP_ARG_WITH(libedit,for libedit readline replacement,
@@ -18,15 +18,16 @@
if test -z "$READLINE_DIR"; then
AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h)
fi
+
PHP_ADD_INCLUDE($READLINE_DIR/include)
AC_CHECK_LIB(ncurses, tgetent,
[
- PHP_ADD_LIBRARY_WITH_PATH(ncurses,,READLINE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
],[
AC_CHECK_LIB(termcap, tgetent,
[
- PHP_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
])
])
@@ -52,9 +53,9 @@
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
-fi
-if test "$PHP_LIBEDIT" != "no"; then
+elif test "$PHP_LIBEDIT" != "no"; then
+
for i in /usr/local /usr $PHP_LIBEDIT; do
if test -f $i/include/readline/readline.h; then
LIBEDIT_DIR=$i
@@ -64,15 +65,16 @@
if test -z "$LIBEDIT_DIR"; then
AC_MSG_ERROR(Please reinstall libedit - I cannot find readline.h)
fi
+
PHP_ADD_INCLUDE($LIBEDIT_DIR/include)
AC_CHECK_LIB(ncurses, tgetent,
[
- PHP_ADD_LIBRARY_WITH_PATH(ncurses,,READLINE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
],[
AC_CHECK_LIB(termcap, tgetent,
[
- PHP_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
])
])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
