cvs: php4(PHP_4_2_0) / acinclude.m4
| From: | Jani Taskinen | Date: | Tue, 19 Mar 2002 22:40:29 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) / acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10441@lists.php.net to get a copy of this message | ||
sniper Tue Mar 19 17:40:29 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4 acinclude.m4
Log:
- MFH iconv fix
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.157.2.1 php4/acinclude.m4:1.157.2.2
--- php4/acinclude.m4:1.157.2.1 Mon Mar 18 20:08:14 2002
+++ php4/acinclude.m4 Tue Mar 19 17:40:29 2002
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.157.2.1 2002/03/19 01:08:14 ssb Exp $
+dnl $Id: acinclude.m4,v 1.157.2.2 2002/03/19 22:40:29 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -1199,7 +1199,7 @@
AC_DEFUN(PHP_SETUP_ICONV, [
found_iconv=no
- AC_CHECK_LIB(c, iconv_open, [
+ AC_CHECK_FUNCS(iconv libiconv, [
AC_DEFINE(HAVE_ICONV, 1, [ ])
found_iconv=yes
], [
@@ -1222,7 +1222,7 @@
if test -f $ICONV_DIR/lib/lib${iconv_lib_name}.a ||
test -f $ICONV_DIR/lib/lib${iconv_lib_name}.$SHLIB_SUFFIX_NAME
then
- PHP_CHECK_LIBRARY($iconv_lib_name, libiconv_open, [
+ PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
found_iconv=yes
PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1)
AC_DEFINE(HAVE_ICONV, 1, [ ])