Skip to content

Commit

Permalink
Merge branch 'mn/maint-iconv-autoconf'
Browse files Browse the repository at this point in the history
* mn/maint-iconv-autoconf:
  fix handling of iconv configuration options
  • Loading branch information
Junio C Hamano committed Jun 21, 2009
2 parents 12d4ffa + 934f82a commit 974e6e4
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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], [
Expand Down Expand Up @@ -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.

Expand Down

0 comments on commit 974e6e4

Please sign in to comment.