[libvirt] [PATCH 4/9] Convert HAVE_SANLOCK to WITH_SANLOCK

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- configure.ac | 4 ++-- src/Makefile.am | 10 +++++----- tools/Makefile.am | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index ded622b..0501d5c 100644 --- a/configure.ac +++ b/configure.ac @@ -1189,7 +1189,7 @@ if test "x$with_sanlock" != "xno"; then CPPFLAGS="$old_cppflags" LIBS="$old_libs" if test "x$with_sanlock" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_SANLOCK], 1, + AC_DEFINE_UNQUOTED([WITH_SANLOCK], 1, [whether Sanlock plugin for lock management is available]) AC_CHECK_LIB([sanlock_client], [sanlock_killpath], @@ -1208,7 +1208,7 @@ if test "x$with_sanlock" != "xno"; then fi fi fi -AM_CONDITIONAL([HAVE_SANLOCK], [test "x$with_sanlock" = "xyes"]) +AM_CONDITIONAL([WITH_SANLOCK], [test "x$with_sanlock" = "xyes"]) AC_SUBST([SANLOCK_CFLAGS]) AC_SUBST([SANLOCK_LIBS]) diff --git a/src/Makefile.am b/src/Makefile.am index da571c7..87aa2f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1353,7 +1353,7 @@ else check-augeas-lxc: endif -if HAVE_SANLOCK +if WITH_SANLOCK test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ locking/qemu-sanlock.conf $(AUG_GENTEST) $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ @@ -1718,7 +1718,7 @@ virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status mv $@-t $@ -if HAVE_SANLOCK +if WITH_SANLOCK lockdriver_LTLIBRARIES += sanlock.la sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) sanlock_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS) @@ -1882,7 +1882,7 @@ endif EXTRA_DIST += $(STORAGE_HELPER_DISK_SOURCES) -if HAVE_SANLOCK +if WITH_SANLOCK libexec_PROGRAMS += libvirt_sanlock_helper libvirt_sanlock_helper_SOURCES = $(LOCK_DRIVER_SANLOCK_HELPER_SOURCES) @@ -1969,7 +1969,7 @@ endif $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" -if HAVE_SANLOCK +if WITH_SANLOCK $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" endif if WITH_QEMU @@ -2023,7 +2023,7 @@ endif rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||: -if HAVE_SANLOCK +if WITH_SANLOCK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: endif if WITH_QEMU diff --git a/tools/Makefile.am b/tools/Makefile.am index 3775914..878a114 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -43,7 +43,7 @@ bin_SCRIPTS = virt-xml-validate virt-pki-validate bin_PROGRAMS = virsh virt-host-validate libexec_SCRIPTS = libvirt-guests.sh -if HAVE_SANLOCK +if WITH_SANLOCK sbin_SCRIPTS = virt-sanlock-cleanup DISTCLEANFILES += virt-sanlock-cleanup endif @@ -53,7 +53,7 @@ dist_man1_MANS = \ virt-pki-validate.1 \ virt-xml-validate.1 \ virsh.1 -if HAVE_SANLOCK +if WITH_SANLOCK dist_man8_MANS = virt-sanlock-cleanup.8 endif -- 1.7.11.7