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>

diff --git a/configure.ac b/configure.ac
index 67c1ae0ed8dfea875408681b62917824ebf08483..9bbc7dafc42190cde1bfc3d049412cfc11959bfb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -143,9 +143,12 @@ AC_CHECK_LIB([expat], [XML_ParserCreate],
 AC_SUBST(NO_EXPAT)
 #
 # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
 AC_SUBST(NO_EXPAT)
 #
 # 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=YesPlease])
+       [NEEDS_LIBICONV=],
+       AC_CHECK_LIB([iconv], [iconv],
+               [NEEDS_LIBICONV=YesPlease],
+               [GIT_CONF_APPEND_LINE([NO_ICONV=YesPlease])]))

 AC_SUBST(NEEDS_LIBICONV)
 test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv"
 #
 AC_SUBST(NEEDS_LIBICONV)
 test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv"
 #