From: "Daniel P. Berrange" <berra...@redhat.com>
Signed-off-by: Daniel P. Berrange <berra...@redhat.com>
---
configure.ac | 4 ++--
src/Makefile.am | 8 ++++----
tools/Makefile.am | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index ef07386..ccd6480 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1134,11 +1134,11 @@ 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])
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 4ae741b..4f9de11 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1280,7 +1280,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 $< $@
@@ -1486,7 +1486,7 @@ libvirt_qemu_la_CFLAGS = $(AM_CFLAGS)
libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE)
-if HAVE_SANLOCK
+if WITH_SANLOCK
lockdriverdir = $(libdir)/libvirt/lock-driver
lockdriver_LTLIBRARIES = sanlock.la
@@ -1709,7 +1709,7 @@ install-data-local:
$(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
@@ -1755,7 +1755,7 @@ uninstall-local::
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 0d7822d..f5965a4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -42,7 +42,7 @@ DISTCLEANFILES =
bin_SCRIPTS = virt-xml-validate virt-pki-validate
bin_PROGRAMS = virsh virt-host-validate
-if HAVE_SANLOCK
+if WITH_SANLOCK
sbin_SCRIPTS = virt-sanlock-cleanup
DISTCLEANFILES += virt-sanlock-cleanup
endif
@@ -52,7 +52,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.4
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
