On 05/23/2012 04:57 PM, Eric Blake wrote:
On 05/23/2012 09:32 AM, Daniel P. Berrange wrote:
> On Mon, May 21, 2012 at 08:59:09PM +0100, Daniel P. Berrange wrote:
>
> This is the cause of the XenAPI build failure noted in patch 3.
> Those 2 lines inside the if WITH_DRIVER_MODULES should have
> also been deleted as they were for other entries, eg:
>
>> libvirt_driver_esx_la_CFLAGS = $(LIBCURL_CFLAGS) \
>> -I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS)
>> libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS)
>> libvirt_driver_esx_la_LIBADD = $(LIBCURL_LIBS)
>> -if WITH_DRIVER_MODULES
>> -libvirt_driver_esx_la_LIBADD += ../gnulib/lib/libgnu.la
>> -libvirt_driver_esx_la_LDFLAGS += -module -avoid-version
>> -endif
Yep, I confirmed that with this tweak, the rest of the series worked for
me with an in-tree build (again, see patch 7 for my concerns that we're
still a bit too hard-coded for unusual VPATH setups).
Just to clarify, I'm okay if we push this in to get wider test coverage,
while saving VPATH cleanups for someone that actually experiences
problems with it (as compiling more than one directory away is not a
common setup). This series is definitely an improvement, even if there
are still things we can do further.
Another note: you should probably update .gitignore in the appropriate
patches to cover these files:
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# src/libvirt_probes.h
# src/libvirt_qemu_probes.h
# tests/virdrivermoduletest
--
Eric Blake eblake(a)redhat.com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org