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

[Eric Blake]

On 04/25/2012 12:33 PM, Jim Meyering wrote:

>> 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

I've pushed this now.

-- 
Eric Blake   address@hidden    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature