diff options
| author | foobar <sniper@php.net> | 2003-12-09 20:33:08 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-12-09 20:33:08 +0000 |
| commit | e4c1ae0e67a7311df8c1089ddf91718e19be098b (patch) | |
| tree | 0325fd3136c883e817230a83127d12631a93b66b /ext/ncurses | |
| parent | a35a82ddcd0b5b56aaee75d549011b13bfba3527 (diff) | |
| download | php-git-e4c1ae0e67a7311df8c1089ddf91718e19be098b.tar.gz | |
Fixed bug #26564 (ncurses5 has headers in PREFIX/include/ncurses)
Diffstat (limited to 'ext/ncurses')
| -rw-r--r-- | ext/ncurses/config.m4 | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/ext/ncurses/config.m4 b/ext/ncurses/config.m4 index 77e3c252dd..28ae210fce 100644 --- a/ext/ncurses/config.m4 +++ b/ext/ncurses/config.m4 @@ -9,17 +9,21 @@ if test "$PHP_NCURSES" != "no"; then SEARCH_PATH="$PHP_NCURSES /usr/local /usr" - for i in $SEARCH_PATH ; do - if test -d $i/include; then - if test -r $i/include/ncurses.h; then - NCURSES_DIR=$i + for dir in $SEARCH_PATH; do + for subdir in include/ncurses include; do + if test -d $dir/$subdir; then + if test -r $dir/$subdir/ncurses.h; then + NCURSES_DIR=$dir + NCURSES_INCDIR=$dir/$subdir AC_DEFINE(HAVE_NCURSES_H,1,[ ]) - break - elif test -r $i/include/curses.h; then - NCURSES_DIR=$i - break + break 2 + elif test -r $dir/$subdir/curses.h; then + NCURSES_DIR=$dir + NCURSES_INCDIR=$dir/$subdir + break 2 fi fi + done done if test -z "$NCURSES_DIR"; then @@ -28,7 +32,7 @@ if test "$PHP_NCURSES" != "no"; then fi # --with-ncurses -> add include path - PHP_ADD_INCLUDE($NCURSES_DIR/include) + PHP_ADD_INCLUDE($NCURSES_INCDIR) # --with-ncurses -> chech for lib and symbol presence LIBNAME=ncurses |