cvs: php4 / acinclude.m4
| From: | Jani Taskinen | Date: | Tue, 19 Mar 2002 22:40:18 +0000 |
| Subject: | cvs: php4 / acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10440@lists.php.net to get a copy of this message | ||
sniper Tue Mar 19 17:40:18 2002 EDT
Modified files:
/php4 acinclude.m4
Log:
- Fix the iconv detection when the functions are prefixed with lib.
(e.g. in freebsd)
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.164 php4/acinclude.m4:1.165
--- php4/acinclude.m4:1.164 Sun Mar 17 16:09:20 2002
+++ php4/acinclude.m4 Tue Mar 19 17:40:18 2002
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.164 2002/03/17 21:09:20 sniper Exp $
+dnl $Id: acinclude.m4,v 1.165 2002/03/19 22:40:18 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -1347,7 +1347,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
], [
@@ -1370,7 +1370,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, [ ])