diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-25 18:07:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-25 18:07:51 (GMT) |
| commit | 2f2db83fb77e8c639f8b8ebeab97d92c492d721c (patch) | |
| tree | 19cec52dc38fcf4f08932c38f89ef45b396edb07 /configure.ac | |
| parent | 46c0f913a49218a8a94d30c5a2df792a16aab827 (diff) | |
| parent | 62fb6d03dab0f6d93b1e1fcaef312bf6e2718f17 (diff) | |
| download | git-2f2db83fb77e8c639f8b8ebeab97d92c492d721c.zip git-2f2db83fb77e8c639f8b8ebeab97d92c492d721c.tar.gz git-2f2db83fb77e8c639f8b8ebeab97d92c492d721c.tar.bz2 | |
Merge branch 'dm/configure-iconv-locale-charset'
* dm/configure-iconv-locale-charset:
configure.ac: link with -liconv for locale_charset()
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 24ab738..b711254 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]) |