cvs: php4 /ext/readline config.m4

hholzgra Fri Jan 4 07:27:01 2002 EDT Modified files: /php4/ext/readline config.m4 Log: check for library existance before adding them Index: php4/ext/readline/config.m4 diff -u php4/ext/readline/config.m4:1.12 php4/ext/readline/config.m4:1.13 --- php4/ext/readline/config.m4:1.12 Fri Nov 30 13:59:54 2001 +++ php4/ext/readline/config.m4 Fri Jan 4 07:27:01 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.12 2001/11/30 18:59:54 sniper Exp $ +dnl $Id: config.m4,v 1.13 2002/01/04 12:27:01 hholzgra Exp $ dnl PHP_ARG_WITH(libedit,for libedit readline replacement, @@ -9,9 +9,7 @@ [ --with-readline[=DIR] Include readline support.]) if test "$PHP_READLINE" != "no" -o "$PHP_LIBEDIT" != "no"; then - if test "$PHP_SAPI" != "cgi"; then - AC_MSG_ERROR([readline extension can only be used with CGI build!]) - fi + PHP_CHECK_INTERACTIVE(readline) fi if test "$PHP_READLINE" != "no"; then @@ -32,8 +30,22 @@ PHP_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)]) ]) - PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + PHP_CHECK_LIBRARY(readline, readline, [ + PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + ], [ + AC_MSG_ERROR(readline library not found) + ], [ + -L$READLINE_DIR/lib + ]) + + PHP_CHECK_LIBRARY(history, add_history, [ + PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + ], [ + AC_MSG_ERROR(history library required by readline not found) + ], [ + -L$READLINE_DIR/lib + ]) + PHP_SUBST(READLINE_SHARED_LIBADD) AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) @@ -58,7 +70,14 @@ PHP_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)]) ]) - PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/lib, READLINE_SHARED_LIBADD) + PHP_CHECK_LIBRARY(edit, readline, [ + PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/lib, READLINE_SHARED_LIBADD) + ], [ + AC_MSG_ERROR(edit library required by readline not found) + ], [ + -L$READLINE_DIR/lib + ]) + PHP_SUBST(READLINE_SHARED_LIBADD) AC_DEFINE(HAVE_LIBEDIT, 1, [ ])