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

* dm/configure-iconv-locale-charset: configure.ac: link with -liconv for locale_charset()
11 years ago · 2f2db83fb7
1 changed files with 1 additions and 1 deletions
--- 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])