[libvirt] [PATCHv2 2/2] freebsd: Fix build problem due to picking up the wrong libvirt.h

[Eric Blake]

On 07/29/2011 07:16 AM, Matthias Bolte wrote:
> 2011/7/28 Eric Blake<eblake at redhat.com>:
>> From: Matthias Bolte<matthias.bolte at googlemail.com>
>>
>> Gettext annoyingly modifies CPPFLAGS in-place, putting
>> -I/usr/local/include into the search patch if libintl headers
>> must be used from that location.  But since we must support
>> automake 1.9.6 which lacks AM_CPPFLAGS, and since CPPFLAGS is used
>> prior to INCLUDES, this means that the build picks up the _old_
>> installed libvirt.h in priority to the in-tree version, leading
>> to all sorts of weird build failures on FreeBSD.
>>
>> Fix this by teaching configure to undo gettext's actions, but
>> to keep any changes required by gettext at the end of INCLUDES
>> after all in-tree locations are used first.  Also requires
>> adding a wrapper Makefile.am and making gnulib-tool create
>> just gnulib.mk files during the bootstrap process.
>> ---
>>
>> v1 is here:
>> https://www.redhat.com/archives/libvir-list/2011-July/msg01984.html
>>
>> v2: update bootstrap.conf and gnulib/*/Makefile.am to fix gnulib
>> compilation, update .gitignore to allow committing new files.
>
> Works. ACK.

Thanks for testing.  Now applied.

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org