From 6ff88de7f7affba3e9899cfdab4dab46b554e93f Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Thu, 7 Sep 2006 13:48:08 +0200 Subject: autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 67c1ae0ed8..9bbc7dafc4 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" # -- cgit v1.2.1