cvs: php4 / acinclude.m4
| From: | Jon Parise | Date: | Wed, 20 Mar 2002 07:36:56 +0000 |
| Subject: | cvs: php4 / acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10458@lists.php.net to get a copy of this message | ||
jon Wed Mar 20 02:36:56 2002 EDT
Modified files:
/php4 acinclude.m4
Log:
This completely fixes the iconv library detection under FreeBSD (the
previous fix was incomplete). We also set HAVE_ICONV and HAVE_LIBICONV
based on the library that was detected.
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.166 php4/acinclude.m4:1.167
--- php4/acinclude.m4:1.166 Tue Mar 19 21:07:10 2002
+++ php4/acinclude.m4 Wed Mar 20 02:36:56 2002
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.166 2002/03/20 02:07:10 sniper Exp $
+dnl $Id: acinclude.m4,v 1.167 2002/03/20 07:36:56 jon Exp $
dnl
dnl This file contains local autoconf functions.
@@ -1382,10 +1382,15 @@
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, [ ])
AC_DEFINE(HAVE_LIBICONV, 1, [ ])
], [
- found_iconv=no
+ PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
+ found_iconv=yes
+ PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1)
+ AC_DEFINE(HAVE_ICONV, 1, [ ])
+ ], [
+ found_iconv=no
+ ])
], [
-L$ICONV_DIR/lib
])