summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@amdmi3.ru>2014-03-11 22:35:29 +0400
committerJunio C Hamano <gitster@pobox.com>2014-03-11 13:33:15 -0700
commit62fb6d03dab0f6d93b1e1fcaef312bf6e2718f17 (patch)
tree9ed606971dc178589b291da384547f0c0a7a2349 /configure.ac
parent2f93541d88fadd1ff5307d81c2c8921ee3eea058 (diff)
downloadgit-62fb6d03dab0f6d93b1e1fcaef312bf6e2718f17.tar.gz
configure.ac: link with -liconv for locale_charset()dm/configure-iconv-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>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 2f433939dc..3f5c644afd 100644
--- a/configure.ac
+++ b/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])