cvs: php-src(PHP_5_0) / NEWS /ext/iconv config.m4

tony2001 Thu Oct 13 11:24:26 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/iconv config.m4 /php-src NEWS Log: MFH: fix #34856 (configure fails to detect libiconv's type) http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.27.2.2&r2=1.27.2.3&ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.27.2.2 php-src/ext/iconv/config.m4:1.27.2.3 --- php-src/ext/iconv/config.m4:1.27.2.2 Mon Jan 10 16:37:59 2005 +++ php-src/ext/iconv/config.m4 Thu Oct 13 11:24:25 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.27.2.2 2005/01/10 21:37:59 tony2001 Exp $ +dnl $Id: config.m4,v 1.27.2.3 2005/10/13 15:24:25 tony2001 Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -18,7 +18,14 @@ iconv_ldflags_save="$LDFLAGS" if test -z "$ICONV_DIR"; then - PHP_ICONV_PREFIX="/usr" + for i in /usr /usr/local; do + if test -f "$i/include/iconv.h" -o test -f "$i/include/giconv.h"; then + PHP_ICONV_PREFIX="$i" + fi + done + if test -z "$PHP_ICONV_PREFIX"; then + PHP_ICONV_PREFIX="/usr" + fi else PHP_ICONV_PREFIX="$ICONV_DIR" fi http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.499&r2=1.1760.2.500&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.499 php-src/NEWS:1.1760.2.500 --- php-src/NEWS:1.1760.2.499 Thu Oct 13 08:59:12 2005 +++ php-src/NEWS Thu Oct 13 11:24:25 2005 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 5.0.6 - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) +- Fixed bug #34856 (configure fails to detect libiconv's type). (Tony) - Fixed bug #34855 (ibase_service_attach() segfault on AMD64). (irie at gmx dot de, Tony) - Fixed bug #34810 (mysqli::init() and others use wrong $this pointer