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

tony2001 Thu Oct 13 11:23:16 2005 EDT Modified files: (Branch: PHP_5_1) /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.33&r2=1.33.2.1&ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.33 php-src/ext/iconv/config.m4:1.33.2.1 --- php-src/ext/iconv/config.m4:1.33 Sun Jun 19 20:52:56 2005 +++ php-src/ext/iconv/config.m4 Thu Oct 13 11:23:11 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.33 2005/06/20 00:52:56 sniper Exp $ +dnl $Id: config.m4,v 1.33.2.1 2005/10/13 15:23:11 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.2027.2.125&r2=1.2027.2.126&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.125 php-src/NEWS:1.2027.2.126 --- php-src/NEWS:1.2027.2.125 Thu Oct 13 08:58:42 2005 +++ php-src/NEWS Thu Oct 13 11:23:11 2005 @@ -43,6 +43,7 @@ - Fixed "make test" to work for phpized extensions. (Hartmut, Jani) - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems. (Andrey) +- 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 #34850 (--program-suffix and --program-prefix not included in