sniper Tue Dec 9 15:33:23 2003 EDT Modified files: (Branch: PHP_4_3) /php-src NEWS /php-src/ext/ncurses config.m4 Log: MFH: Fixed bug #26564 (ncurses5 has headers in PREFIX/include/ncurses/) Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.494 php-src/NEWS:1.1247.2.495 --- php-src/NEWS:1.1247.2.494 Sun Dec 7 12:02:26 2003 +++ php-src/NEWS Tue Dec 9 15:33:21 2003 @@ -5,6 +5,7 @@ (Jani) - Fixed header handler in NSAPI SAPI module (header->replace was ignored, send_default_content_type now sends value from php.ini). (Uwe Schindler) +- Fixed bug #26564 (ncurses5 has headers in PREFIX/include/ncurses/). (Jani) - Fixed bug #26548 (ext/session: Malformed HTTP dates headers). (Derick) - Fixed bug #26531 (ext/domxml: get_elements_by_tag_name() wildcard fails). (Rob Richards) Index: php-src/ext/ncurses/config.m4 diff -u php-src/ext/ncurses/config.m4:1.13.2.3 php-src/ext/ncurses/config.m4:1.13.2.4 --- php-src/ext/ncurses/config.m4:1.13.2.3 Fri Oct 3 21:04:54 2003 +++ php-src/ext/ncurses/config.m4 Tue Dec 9 15:33:22 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13.2.3 2003/10/04 01:04:54 sniper Exp $ +dnl $Id: config.m4,v 1.13.2.4 2003/12/09 20:33:22 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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php