diff --git a/configure.ac b/configure.ac
index 7937e604be34eadddc314c0eff0cea226af19c9c..1885674e396d31cc625d34d029835e15b279dc8d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
# some Solaris installations).
# Define NO_ICONV if neither libc nor libiconv support iconv.
# 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], [
GIT_STASH_FLAGS($ICONVDIR)
AC_DEFUN([ICONVTEST_SRC], [
AC_SUBST(NEEDS_LIBICONV)
AC_SUBST(NO_ICONV)
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.
#
# Define NO_DEFLATE_BOUND if deflateBound is missing from zlib.