Re: [PATCH] Fix build with qemu driver disabled

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 08.03.2014 17:51, Roman Bogorodskiy wrote:
Do not include test_libvirt_lockd.aug when configured without qemu
driver.

https://bugzilla.redhat.com/show_bug.cgi?id=1071777
---
  src/Makefile.am | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 25d0370..e5cbad0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1757,7 +1757,9 @@ if WITH_QEMU
  test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
  		locking/qemu-lockd.conf $(AUG_GENTEST)
  	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< $@
-endif WITH_QEMU
+else ! WITH_QEMU
+test_libvirt_lockd.aug:
+endif ! WITH_QEMU

  test_virtlockd.aug: locking/test_virtlockd.aug.in \
  		locking/virtlockd.conf $(AUG_GENTEST)
@@ -2122,12 +2124,12 @@ lockd_la_LIBADD = ../gnulib/lib/libgnu.la \
  	libvirt-net-rpc-client.la \
  	$(NULL)
  augeas_DATA += locking/libvirt_lockd.aug
-augeastest_DATA += test_libvirt_lockd.aug
-CLEANFILES += test_libvirt_lockd.aug
  if WITH_DTRACE_PROBES
  lockd_la_LIBADD += libvirt_probes.lo
  endif WITH_DTRACE_PROBES
  if WITH_QEMU
+augeastest_DATA += test_libvirt_lockd.aug
+CLEANFILES += test_libvirt_lockd.aug
  nodist_conf_DATA += locking/qemu-lockd.conf
  BUILT_SOURCES += locking/qemu-lockd.conf
  DISTCLEANFILES += locking/qemu-lockd.conf


ACKed and pushed.

Michal

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]