cvs: php4 /ext/iconv config.m4
| From: | Jani Taskinen | Date: | Tue, 26 Jun 2001 11:35:34 +0000 |
| Subject: | cvs: php4 /ext/iconv config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6024@lists.php.net to get a copy of this message | ||
sniper Tue Jun 26 13:35:34 2001 EDT
Modified files:
/php4/ext/iconv config.m4
Log:
Simplify this and fix bug: #11654
Index: php4/ext/iconv/config.m4
diff -u php4/ext/iconv/config.m4:1.3 php4/ext/iconv/config.m4:1.4
--- php4/ext/iconv/config.m4:1.3 Mon May 21 18:18:51 2001
+++ php4/ext/iconv/config.m4 Tue Jun 26 13:35:34 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.3 2001/05/21 16:18:51 sniper Exp $
+dnl $Id: config.m4,v 1.4 2001/06/26 11:35:34 sniper Exp $
dnl config.m4 for extension iconv
PHP_ARG_WITH(iconv, for iconv support,
@@ -6,33 +6,22 @@
if test "$PHP_ICONV" != "no"; then
- if test -r $PHP_ICONV/include/iconv.h; then
- ICONV_DIR=$PHP_ICONV
- else
- AC_MSG_CHECKING(for iconv in default path)
- for i in /usr/local /usr; do
- if test -r $i/include/iconv.h; then
- ICONV_DIR=$i
- AC_MSG_RESULT(found in $i)
- fi
- done
- fi
+ for i in /usr /usr/local $PHP_ICONV; do
+ test -r $i/include/iconv.h && ICONV_DIR=$i
+ done
if test -z "$ICONV_DIR"; then
- AC_MSG_RESULT(not found)
- AC_MSG_ERROR(Please reinstall the iconv library)
+ AC_MSG_ERROR(Please reinstall the iconv library.)
fi
- PHP_ADD_INCLUDE($ICONV_DIR/include)
-
- PHP_SUBST(ICONV_SHARED_LIBADD)
-
- if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.so ; then
+ if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.s? ; then
PHP_ADD_LIBRARY_WITH_PATH(iconv, $ICONV_DIR/lib, ICONV_SHARED_LIBADD)
- AC_CHECK_LIB(iconv, iconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ]))
+ AC_CHECK_LIB(iconv, libiconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ]))
else
AC_CHECK_LIB(c, iconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ]))
fi
+ PHP_ADD_INCLUDE($ICONV_DIR/include)
PHP_EXTENSION(iconv, $ext_shared)
+ PHP_SUBST(ICONV_SHARED_LIBADD)
fi