Re: [PATCH] bootstrap: work around BSD toolchain snafu

[Michael Haubenwallner]

On 12/04/13 03:03, Eric Blake wrote:
> Signed-off-by: Eric Blake <address@hidden>
> ---
> 
> I'm not pushing this without a decent review, particularly since
> I haven't personally tested it with the FreeBSD setup that Roman
> reported where gettext 0.18.3 doesn't play nicely with the
> autom4te wrapper.

Not actually testing, just reading the diff with Solaris 10 /bin/sh in mind:

> @@ -813,17 +813,40 @@ grep '^[         ]*AM_GNU_GETTEXT_VERSION(' 
> configure.ac >/dev/null || \
> 
>  if test $with_gettext = yes || test $use_libtool = 1; then
> 
> +  autopoint_cleanup=

Feels like the initial value should be 'false' rather than empty:
'if $empty;' evaluates to true, even with bash.

> -  trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15
> +  trap "rm -f $tempbase.0 $tempbase.1
> +    if \$autopoint_cleanup; then
> +      rm -f intl/VERSION
> +      rmdir -p intl
> +    fi
> +  " 1 2 13 15

> +
> +    if $autopoint_cleanup; then
> +      rm -f intl/VERSION
> +      rmdir -p intl
> +      autopoint_cleanup=
> +    fi

/haubi/