Re: [libvirt] [PATCH] build: Fix version of gettext macros

[Jim Meyering]

Eric Blake wrote:
> [trimming cc's for now]
>
> On 04/25/2012 09:38 AM, Jim Meyering wrote:
>>> Another possible alternative: install the precise 0.17 Makefile.in.in
>>> via libvirt's gnulib-local, so that when gnulib-tool runs, we are back
>>> to bootstrap picking up the version that we know we want to use in libvirt.
>
> gnulib-local doesn't work.  The change has to be to bootstrap, but
> './bootstrap --sync-bootstrap' doesn't honor gnulib-local (rather, it
> directly copies from the current state of the gnulib submodule).
>
> Is it worth my time trying to teach './bootstrap --sync-bootstrap' to
> honor gnulib-local diffs?  Maybe not; after all, the reason we first

That doesn't seem worthwhile.

...
> In other words, I'm thinking this patch is appropriate (I've tested it
> on libvirt, which uses gettext-h, and on bison which uses gettext).

That looks good, and your testing seems to cover all bases.
Thanks for dealing with this.

> diff --git i/build-aux/bootstrap w/build-aux/bootstrap
...
> @@ -873,7 +873,15 @@ if test $with_gettext = yes; then
>      }
>    ' po/Makevars.template >po/Makevars || exit 1
>
> -  cat $GNULIB_SRCDIR/build-aux/po/Makefile.in.in > po/Makefile.in.in ||
> exit 1
> +  # If the 'gettext' module is in use, grab the latest Makefile.in.in.
> +  # If only the 'gettext-h' module is in use, assume autopoint already
> +  # put the correct version of this file into place.
> +  case $gnulib_modules in
> +  *gettext-h*) ;;
> +  *gettext*)
> +    cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in ||
> exit 1
> +    ;;
> +  esac