diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:14:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:14:25 -0700 |
| commit | 6019b3ce8d178ed99d37b32cc2c523c25f0d58a1 (patch) | |
| tree | 7d7684899c730b4c3e801a2cb7073f2d171150bc | |
| parent | 44fb185963d42bb1dd6f1b3ea690d2a8f3c4edbc (diff) | |
| parent | 934f82a7d424ea9a8fa0ae83020689d11efc2bff (diff) | |
| download | git-6019b3ce8d178ed99d37b32cc2c523c25f0d58a1.tar.gz git-6019b3ce8d178ed99d37b32cc2c523c25f0d58a1.tar.xz | |
Merge branch 'mn/maint-iconv-autoconf' into maint
* 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 4e728bca3..25fbe3bb6 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. |