Fixes for check and rpm builds without sanlock (and qemu)

Apart from the non-sanlock check build, there is also a little fix for
qemu (EXTRA_DIST had qemu.conf and others inside even if the build was
supposed to be without qemu).

diff --git a/libvirt.spec.in b/libvirt.spec.in
index d4e43f61c8b2a65885185c088b7a134fa0d6ba48..3c544f17f81e83a9a12859ba25e61d3d3a9ed491 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1232,6 +1232,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
 %find_lang %{name}
 
+%if ! %{with_sanlock}
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
+%endif
+
 %if ! %{with_lxc}
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug

diff --git a/src/Makefile.am b/src/Makefile.am
index 781c54719312a84d211a664d6bf1be3ff54b065b..c023fb9a2e7f6f590e71602d90a943ef82f6f582 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1148,6 +1148,7 @@ else
 check-augeas-lxc:
 endif
 
+if HAVE_SANLOCK
 test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
                locking/qemu-sanlock.conf $(AUG_GENTEST)
        $(AUG_GENTEST) locking/qemu-sanlock.conf $< $@
@@ -1156,6 +1157,9 @@ check-augeas-sanlock: test_libvirt_sanlock.aug
        $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
            '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \
        fi
+else
+check-augeas-sanlock:
+endif
 
 #
 # Build our version script.  This is composed of three parts: