From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Mar 2014 18:07:51 +0000 (-0700)
Subject: Merge branch 'dm/configure-iconv-locale-charset'
X-Git-Tag: v2.0.0-rc0~66
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2f2db83fb77e8c639f8b8ebeab97d92c492d721c?hp=46c0f913a49218a8a94d30c5a2df792a16aab827

Merge branch 'dm/configure-iconv-locale-charset'

* dm/configure-iconv-locale-charset:
configure.ac: link with -liconv for locale_charset()
---

diff --git a/configure.ac b/configure.ac
index 24ab7383ae..b7112542b4 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])