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

* dm/configure-iconv-locale-charset: configure.ac: link with -liconv for locale_charset()
dwbxm · Mar 25, 2014 · 2f2db83 · 2f2db83
2 parents 46c0f91 + 62fb6d0
commit 2f2db83
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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])