Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'dm/configure-iconv-locale-charset'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 25 Mar 2014 18:07:51 +0000
(11:07 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 25 Mar 2014 18:07:51 +0000
(11:07 -0700)
* dm/configure-iconv-locale-charset:
configure.ac: link with -liconv for locale_charset()
configure.ac
patch
|
blob
|
history
raw
(from parent 1:
46c0f91
)
diff --git
a/configure.ac
b/configure.ac
index 24ab7383aecf36e010f838d04b671903d1d8a79f..b7112542b4b62fbbf0235c923f75803edc149e5c 100644
(file)
--- 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])