From: Jon Parise <jon@php.net>
Date: Wed, 20 Mar 2002 07:36:56 +0000 (+0000)
Subject: This completely fixes the iconv library detection under FreeBSD (the
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~1197
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb82bf2e2b78067d3077e372d932f18d55daae13;p=php

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 79f6408d3b..44139d57ae 100644
--- 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
       ])