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>
Jakub Narebski committed
Sep 7, 2006 at 13:48 UTC
6ff88de7f7affba3e9899cfdab4dab46b554e93f
1 file changed
+5
-2
configure.ac
+5
-2
@@ -143,9 +143,12 @@ AC_CHECK_LIB([expat], [XML_ParserCreate],
143
AC_SUBST(NO_EXPAT)
144
#
145
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
146
+# Define NO_ICONV if neither libc nor libiconv support iconv.
147
AC_CHECK_LIB([c], [iconv],
147
-[NEEDS_LIBICONV=],
148
-[NEEDS_LIBICONV=YesPlease])
148
+ [NEEDS_LIBICONV=],
149
+ AC_CHECK_LIB([iconv], [iconv],
150
+ [NEEDS_LIBICONV=YesPlease],
151
+ [GIT_CONF_APPEND_LINE([NO_ICONV=YesPlease])]))
152
AC_SUBST(NEEDS_LIBICONV)
153
test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv"
154
#