configure.ac: link with -liconv for locale_charset()

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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Dmitry Marakasov committed Mar 11, 2014 at 22:35 UTC 62fb6d03dab0f6d93b1e1fcaef312bf6e2718f17
1 file changed +1 -1
configure.ac
+1 -1
@@ -890,7 +890,7 @@ GIT_CONF_SUBST([HAVE_STRINGS_H])
890 # and libcharset does
891 CHARSET_LIB=
892 AC_CHECK_LIB([iconv], [locale_charset],
893 - [],
893 + [CHARSET_LIB=-liconv],
894 [AC_CHECK_LIB([charset], [locale_charset],
895 [CHARSET_LIB=-lcharset])])
896 GIT_CONF_SUBST([CHARSET_LIB])