aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2006-08-04 23:28:11 +0200
committerJunio C Hamano <junkio@cox.net>2006-08-04 16:34:30 -0700
commitf7b5e8d03a97e7d4a6e543d5f9972d1285947908 (patch)
treed2b5862d20550fcba3a85c0356389088fb362c92
parent3068f6c47d8ece84c7daba243d3f60492bd0611e (diff)
downloadgit-f7b5e8d03a97e7d4a6e543d5f9972d1285947908.tar.gz
git-f7b5e8d03a97e7d4a6e543d5f9972d1285947908.tar.xz
autoconf: Set NEEDS_LIBICONV unconditionally if there is no iconv in libc
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--configure.ac3
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index fea18b69b..33ddee212 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,8 +172,7 @@ AC_CHECK_LIB([expat], [XML_ParserCreate],[],
#
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
AC_CHECK_LIB([c], [iconv],[],
-[AC_CHECK_LIB([iconv],[iconv],
- [GIT_CONF_APPEND_LINE(NEEDS_LIBICONV=YesPlease)],[])])
+[GIT_CONF_APPEND_LINE(NEEDS_LIBICONV=YesPlease)])
#
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
# Patrick Mauritz).