X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=1885674e396d31cc625d34d029835e15b279dc8d;hb=974e6e42f7a66b69bd684af4f637ab064acfdf92;hp=7937e604be34eadddc314c0eff0cea226af19c9c;hpb=12d4ffaa94c1379c307cdf489565531c5d6c94fd;p=git.git

diff --git a/configure.ac b/configure.ac
index 7937e604b..1885674e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -385,6 +385,8 @@ AC_SUBST(NO_EXPAT)
 # some Solaris installations).
 # Define NO_ICONV if neither libc nor libiconv support iconv.
 
+if test -z "$NO_ICONV"; then
+
 GIT_STASH_FLAGS($ICONVDIR)
 
 AC_DEFUN([ICONVTEST_SRC], [
@@ -431,6 +433,12 @@ GIT_UNSTASH_FLAGS($ICONVDIR)
 AC_SUBST(NEEDS_LIBICONV)
 AC_SUBST(NO_ICONV)
 
+if test -n "$NO_ICONV"; then
+    NEEDS_LIBICONV=
+fi
+
+fi
+
 #
 # Define NO_DEFLATE_BOUND if deflateBound is missing from zlib.