path: root/
diff options
authorJakub Narebski <>2006-09-07 11:48:49 (GMT)
committerJunio C Hamano <>2006-09-07 20:04:21 (GMT)
commitbaf1219acbda6ba361c388363ba2e771d95bbb2d (patch)
treea3d231e201a7e5c5202d101419161673f68d0d5d /
parent6ff88de7f7affba3e9899cfdab4dab46b554e93f (diff)
autoconf: Add support for setting NO_ICONV and ICONVDIR
Add support for ./configure options --without-iconv (if neither libc nor libiconv properly support iconv), and for --with-iconv=PATH (to set prefix to libiconv library and headers, used only when NEED_LIBICONV is set). While at it, make ./configure set or unset NO_ICONV always (it is not autodetected in Makefile). Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 12 insertions, 1 deletions
diff --git a/ b/
index 9bbc7da..511cac9 100644
--- a/
+++ b/
@@ -148,8 +148,9 @@ AC_CHECK_LIB([c], [iconv],
AC_CHECK_LIB([iconv], [iconv],
+ [NO_ICONV=YesPlease]))
test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv"
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
@@ -343,6 +344,16 @@ GIT_PARSE_WITH(expat))
# library directories by defining CFLAGS and LDFLAGS appropriately.
# Define NO_MMAP if you want to avoid mmap.
+# Define NO_ICONV if your libc does not properly support iconv.
+[if your architecture doesn't properly support iconv])
+[PATH is prefix for libiconv library and headers])
+[used only if you need linking with libiconv]),
## --enable-FEATURE[=ARG] and --disable-FEATURE