cvs: php-src /ext/ncurses config.m4

sniper Tue Dec 9 15:33:08 2003 EDT Modified files: /php-src/ext/ncurses config.m4 Log: Fixed bug #26564 (ncurses5 has headers in PREFIX/include/ncurses) Index: php-src/ext/ncurses/config.m4 diff -u php-src/ext/ncurses/config.m4:1.16 php-src/ext/ncurses/config.m4:1.17 --- php-src/ext/ncurses/config.m4:1.16 Fri Oct 3 21:04:31 2003 +++ php-src/ext/ncurses/config.m4 Tue Dec 9 15:33:08 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.16 2003/10/04 01:04:31 sniper Exp $ +dnl $Id: config.m4,v 1.17 2003/12/09 20:33:08 sniper Exp $ dnl PHP_ARG_WITH(ncurses, for ncurses support, @@ -9,17 +9,21 @@ 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 @@ 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