summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2006-09-07 11:48:08 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-07 20:02:29 (GMT)
commit6ff88de7f7affba3e9899cfdab4dab46b554e93f (patch)
tree293339182952ab099276564ac5b866bef4bdecb5 /configure.ac
parent7bbf88c52b202d543310123e1bad9a44b2d6f028 (diff)
downloadgit-6ff88de7f7affba3e9899cfdab4dab46b554e93f.zip
git-6ff88de7f7affba3e9899cfdab4dab46b554e93f.tar.gz
git-6ff88de7f7affba3e9899cfdab4dab46b554e93f.tar.bz2
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>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 67c1ae0..9bbc7da 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"
#