Re: [PATCH] fix handling of iconv configuration options

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 8, 2009, 21:50 UTC
Message-ID: <7vhbyqwg2y.fsf@alter.siamese.dyndns.org>
In-Reply-To: <3a3d9e520906071745k1fde4215xba310d945db37979@mail.gmail.com>

Marco Nelissen <marcone@xs4all.nl> writes:

Show 23 quoted lines

> diff --git a/configure.ac b/configure.ac
> index 108a97f..3388036 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
> +

Hmm, have you tested this with both NO_ICONV defined and undefined?

Because ...

	$ test -z ; echo $?
        0
	$ test -n ; echo $?
        0

... I would feel better if you had dq around $NO_ICONV in both tests.