mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-21 13:56:11 +02:00
Code

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
parent 46c0f913a4 62fb6d03da
commit 2f2db83fb7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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])