From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Mar 2014 20:35:41 GMT
Subject: Re: [PATCH] configure.ac: link with -liconv for locale_charset()
Message-ID: <xmqqsiqoo4ma.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20140311183529.GA73693@hades.panopticon>

Dmitry Marakasov <amdmi3@amdmi3.ru> writes:

> On e.g. FreeBSD 10.x, the following situation is common:
> - there's iconv implementation in libc, which has no locale_charset()
>   function
> - there's GNU libiconv installed from Ports Collection
>
> Git build process
> - detects that iconv is in libc and thus -liconv is not needed for it
> - detects locale_charset in -liconv, but for some reason doesn't add it
>   to CHARSET_LIB (as it would do with -lcharset if locale_charset() was
>   found there instead of -liconv)
> - git doesn't build due to unresolved external locale_charset()
>
> Fix this by adding -liconv to CHARSET_LIB if locale_charset() is
> detected in this library.
>
> Signed-off-by: Dmitry Marakasov <amdmi3@amdmi3.ru>
> ---

Looks sensible; Dilyan, any comments?

>  configure.ac | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git configure.ac configure.ac
> index 2f43393..3f5c644 100644
> --- configure.ac
> +++ configure.ac
> @@ -890,7 +890,7 @@ GIT_CONF_SUBST([HAVE_STRINGS_H])
>  # and libcharset does
>  CHARSET_LIB=
>  AC_CHECK_LIB([iconv], [locale_charset],
> -       [],
> +       [CHARSET_LIB=-liconv],
>         [AC_CHECK_LIB([charset], [locale_charset],
>                       [CHARSET_LIB=-lcharset])])
>  GIT_CONF_SUBST([CHARSET_LIB])