diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-21 04:47:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 04:47:22 (GMT) |
| commit | 974e6e42f7a66b69bd684af4f637ab064acfdf92 (patch) | |
| tree | a0e077034a5cc15db768b1d217b864cb890eb63f | |
| parent | 12d4ffaa94c1379c307cdf489565531c5d6c94fd (diff) | |
| parent | 934f82a7d424ea9a8fa0ae83020689d11efc2bff (diff) | |
| download | git-974e6e42f7a66b69bd684af4f637ab064acfdf92.zip git-974e6e42f7a66b69bd684af4f637ab064acfdf92.tar.gz git-974e6e42f7a66b69bd684af4f637ab064acfdf92.tar.bz2 | |
Merge branch 'mn/maint-iconv-autoconf'
* mn/maint-iconv-autoconf:
fix handling of iconv configuration options
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 7937e60..1885674 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. |