tony2001 Thu Oct 13 11:13:31 2005 EDT
Modified files:
/php-src/ext/iconv config.m4
Log:
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.34&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.34
--- 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:13:29 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.34 2005/10/13 15:13:29 tony2001 Exp $
dnl
PHP_ARG_WITH(iconv, for iconv support,
@@ -18,6 +18,16 @@
iconv_ldflags_save="$LDFLAGS"
if test -z "$ICONV_DIR"; then
+ 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
+
+ if test -z "$ICONV_DIR"; then
PHP_ICONV_PREFIX="/usr"
else
PHP_ICONV_PREFIX="$ICONV_DIR"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
