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

* dm/configure-iconv-locale-charset:
  configure.ac: link with -liconv for locale_charset()
This commit is contained in:
Junio C Hamano 2014-03-25 11:07:51 -07:00
commit 2f2db83fb7

View File

@ -890,7 +890,7 @@ GIT_CONF_SUBST([HAVE_STRINGS_H])
# and libcharset does # and libcharset does
CHARSET_LIB= CHARSET_LIB=
AC_CHECK_LIB([iconv], [locale_charset], AC_CHECK_LIB([iconv], [locale_charset],
[], [CHARSET_LIB=-liconv],
[AC_CHECK_LIB([charset], [locale_charset], [AC_CHECK_LIB([charset], [locale_charset],
[CHARSET_LIB=-lcharset])]) [CHARSET_LIB=-lcharset])])
GIT_CONF_SUBST([CHARSET_LIB]) GIT_CONF_SUBST([CHARSET_LIB])