undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mn/maint-iconv-autoconf'

Browse Source 
* mn/maint-iconv-autoconf:
  fix handling of iconv configuration options
This commit is contained in:
Junio C Hamano 2009-06-20 21:47:22 -07:00
commit 974e6e42f7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -385,6 +385,8 @@ AC_SUBST(NO_EXPAT)
# some Solaris installations). # some Solaris installations).
# Define NO_ICONV if neither libc nor libiconv support iconv. # Define NO_ICONV if neither libc nor libiconv support iconv.
if test -z "$NO_ICONV"; then
GIT_STASH_FLAGS($ICONVDIR) GIT_STASH_FLAGS($ICONVDIR)
AC_DEFUN([ICONVTEST_SRC], [ AC_DEFUN([ICONVTEST_SRC], [
@ -431,6 +433,12 @@ GIT_UNSTASH_FLAGS($ICONVDIR)
AC_SUBST(NEEDS_LIBICONV) AC_SUBST(NEEDS_LIBICONV)
AC_SUBST(NO_ICONV) 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.