fix handling of iconv configuration options
Fix the way in which the configure script handles --without-iconv (and --with-iconv=no), which it used to essentially ignore. Also fix the way the configure script determines the value of NEEDS_LIBICONV, which would be incorrectly set to 'YesPlease' on systems that lack iconv entirely. Signed-off-by: Marco Nelissen <marcone@xs4all.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Marco Nelissen committed
Jun 8, 2009 at 20:46 UTC
934f82a7d424ea9a8fa0ae83020689d11efc2bff
1 file changed
+8
configure.ac
+8
@@ -385,6 +385,8 @@ AC_SUBST(NO_EXPAT)
385
# some Solaris installations).
386
# Define NO_ICONV if neither libc nor libiconv support iconv.
387
388
+if test -z "$NO_ICONV"; then
389
+
390
GIT_STASH_FLAGS($ICONVDIR)
391
392
AC_DEFUN([ICONVTEST_SRC], [
@@ -431,6 +433,12 @@ GIT_UNSTASH_FLAGS($ICONVDIR)
433
AC_SUBST(NEEDS_LIBICONV)
434
AC_SUBST(NO_ICONV)
435
436
+if test -n "$NO_ICONV"; then
437
+ NEEDS_LIBICONV=
438
+fi
439
+
440
+fi
441
+
442
#
443
# Define NO_DEFLATE_BOUND if deflateBound is missing from zlib.
444