From: Jakub Narebski <jnareb@gmail.com>
Date: Thu, 7 Sep 2006 11:48:08 +0000 (+0200)
Subject: autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv
X-Git-Tag: v1.4.3-rc1~126
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ff88de7f7affba3e9899cfdab4dab46b554e93f;p=git.git

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 67c1ae0ed..9bbc7dafc 100644
--- 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).
+# Define NO_ICONV if neither libc nor libiconv support 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"
 #