autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
7bbf88c52b
commit
6ff88de7f7
@ -143,9 +143,12 @@ AC_CHECK_LIB([expat], [XML_ParserCreate],
|
|||||||
AC_SUBST(NO_EXPAT)
|
AC_SUBST(NO_EXPAT)
|
||||||
#
|
#
|
||||||
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
|
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
|
||||||
|
# Define NO_ICONV if neither libc nor libiconv support iconv.
|
||||||
AC_CHECK_LIB([c], [iconv],
|
AC_CHECK_LIB([c], [iconv],
|
||||||
[NEEDS_LIBICONV=],
|
[NEEDS_LIBICONV=],
|
||||||
[NEEDS_LIBICONV=YesPlease])
|
AC_CHECK_LIB([iconv], [iconv],
|
||||||
|
[NEEDS_LIBICONV=YesPlease],
|
||||||
|
[GIT_CONF_APPEND_LINE([NO_ICONV=YesPlease])]))
|
||||||
AC_SUBST(NEEDS_LIBICONV)
|
AC_SUBST(NEEDS_LIBICONV)
|
||||||
test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv"
|
test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv"
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user