diff options
| author | foobar <sniper@php.net> | 2003-02-11 03:24:56 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-02-11 03:24:56 +0000 |
| commit | 948c33ba888ca0151dd255921da5f9a3b78d5a10 (patch) | |
| tree | 8e421f930d374d308b0e56fb1ffb0d23e4ddcfe6 | |
| parent | ed36254fcc92764ea98f849f2bf7034d62765145 (diff) | |
| download | php-git-948c33ba888ca0151dd255921da5f9a3b78d5a10.tar.gz | |
MFH
| -rw-r--r-- | ext/readline/config.m4 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4 index 982531260c..a22c09dee7 100644 --- a/ext/readline/config.m4 +++ b/ext/readline/config.m4 @@ -18,15 +18,16 @@ if test "$PHP_READLINE" != "no"; then 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 @@ if test "$PHP_READLINE" != "no"; then 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 "$PHP_LIBEDIT" != "no"; then 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) ]) ]) |