From: foobar Date: Sat, 4 Oct 2003 00:43:31 +0000 (+0000) Subject: MFH: ws fix X-Git-Tag: php-4.3.4RC2~50 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2cf6572948d10a594b092e84fa3f1db8be8b2b2;p=php MFH: ws fix --- diff --git a/ext/ncurses/config.m4 b/ext/ncurses/config.m4 index afdf58830b..f69fb62fe8 100644 --- a/ext/ncurses/config.m4 +++ b/ext/ncurses/config.m4 @@ -11,7 +11,7 @@ if test "$PHP_NCURSES" != "no"; then SEARCH_PATH="/usr/local /usr" SEARCH_FOR="/include/curses.h" - if test -r $PHP_NCURSES/; then # path given as parameter + if test -d $PHP_NCURSES/; then # path given as parameter NCURSES_DIR=$PHP_NCURSES else # search default path list AC_MSG_CHECKING(for ncurses files in default path) @@ -37,17 +37,14 @@ if test "$PHP_NCURSES" != "no"; then PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL, [ AC_DEFINE(HAVE_NCURSESLIB,1,[ ]) - - PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD) PHP_CHECK_LIBRARY(panel, new_panel, [ - AC_DEFINE(HAVE_NCURSES_PANEL,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD) - ], [ - ], [ -L$NCURSES_DIR/lib -l$LIBNAME -lm + AC_DEFINE(HAVE_NCURSES_PANEL,1,[ ]) + PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD) + ], [], [ + -L$NCURSES_DIR/lib -l$LIBNAME -lm ]) - - ], [ AC_MSG_ERROR(Wrong ncurses lib version or lib not found) ], [