[libvirt] the price we pay for using gettext-0.14

[Dave Allan]

On 02/24/2010 11:21 AM, Jim Meyering wrote:
> Jim Meyering wrote:
> ...
>>> Here's the work-around:
>>> [just realized this requires a comment.  adding that now]
>>
>> Added the comment, and moved it to be right next to
>> the offending GETTEXT 0.14.1 line:
>>
>> > From 7f006798b0e2fe85a1b22c9bdbeae5b953d99596 Mon Sep 17 00:00:00 2001
>> From: Jim Meyering<meyering at redhat.com>
>> Date: Wed, 24 Feb 2010 10:53:44 +0100
>> Subject: [PATCH] build: ensure that MKINSTALLDIRS is AC_SUBST-defined
>>
>> since we're using gettext-0.14.1, which uses that now-obsolete
>> automake symbol.  Otherwise, make distcheck would fails like this:
>>
>>      make[2]: Entering directory `/t/libvirt-0.7.6/_build/po'
>>      /bin/sh @MKINSTALLDIRS@ /t/libvirt-0.7.6/_inst/share
>>      /bin/sh: @MKINSTALLDIRS@: No such file or directory
>>      make[2]: *** [install-data-yes] Error 127
>>
>> * configure.ac (MKINSTALLDIRS): Define.
>> ---
>>   configure.ac |    5 +++++
>>   1 files changed, 5 insertions(+), 0 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 095e5d2..9934710 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -1655,6 +1655,11 @@ AM_CONDITIONAL([WITH_LIBVIRTD],[test "x$with_libvirtd" = "xyes"])
>>   dnl Check for gettext
>>   AM_GNU_GETTEXT_VERSION([0.14.1])
>>   AM_GNU_GETTEXT([external])
>> +dnl Since we're using such an old version of gettext, we must also define
>> +dnl this symbol, in order to make the autopoint-supplied Makefile.in.in
>> +dnl work properly.
>> +AC_SUBST([MKINSTALLDIRS], [$ac_aux_dir/mkinstalldirs])
>
> That was not right.
> Test failed like this:
>
>      make[2]: Entering directory `/co/libvirt/libvirt-0.7.6/_build/po'
>      /bin/sh ../build-aux/mkinstalldirs /co/libvirt/libvirt-0.7.6/_inst/share
>      /bin/sh: ../build-aux/mkinstalldirs: No such file or directory
>
> Here's the incremental that should solve the problem:
>
> diff --git a/configure.ac b/configure.ac
> index 9934710..77ce7db 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1658,7 +1658,7 @@ AM_GNU_GETTEXT([external])
>   dnl Since we're using such an old version of gettext, we must also define
>   dnl this symbol, in order to make the autopoint-supplied Makefile.in.in
>   dnl work properly.
> -AC_SUBST([MKINSTALLDIRS], [$ac_aux_dir/mkinstalldirs])
> +AC_SUBST([MKINSTALLDIRS], ["\$(top_builddir)/$ac_aux_dir/mkinstalldirs"])
>
>   ALL_LINGUAS=`cd "$srcdir/po">  /dev/null&&  ls *.po | sed 's+\.po$++'`
>
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list

ACK, after applying the original + the incremental I have a working build.

Dave