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.

diff --git a/acinclude.m4 b/acinclude.m4
index 79f6408d3bdc94c065962ef2d9d4eb8b09d56944..44139d57ae9f99359e9b556c7fb3fc05d1b4105c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1382,10 +1382,15 @@ AC_DEFUN(PHP_SETUP_ICONV, [
       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
       ])