sniper Thu Oct 13 15:28:59 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/iconv config.m4
Log:
MFH
http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.33.2.1&r2=1.33.2.2&ty=u
Index: php-src/ext/iconv/config.m4
diff -u php-src/ext/iconv/config.m4:1.33.2.1
php-src/ext/iconv/config.m4:1.33.2.2
--- php-src/ext/iconv/config.m4:1.33.2.1 Thu Oct 13 11:23:11 2005
+++ php-src/ext/iconv/config.m4 Thu Oct 13 15:28:58 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.33.2.1 2005/10/13 15:23:11 tony2001 Exp $
+dnl $Id: config.m4,v 1.33.2.2 2005/10/13 19:28:58 sniper Exp $
dnl
PHP_ARG_WITH(iconv, for iconv support,
@@ -18,9 +18,10 @@
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
+ for i in /usr/local /usr; do
+ if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
PHP_ICONV_PREFIX="$i"
+ break
fi
done
if test -z "$PHP_ICONV_PREFIX"; then
@@ -33,7 +34,7 @@
CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
- if test -r $PHP_ICONV_PREFIX/include/giconv.h; then
+ if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
else
PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
