Convert HAVE_SANLOCK to WITH_SANLOCK

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/configure.ac b/configure.ac
index 9f1bee8d79ec20cb237ab369d8226ff3c063e363..e7e7bdd9830147b0bd8dbd10398b91ae00970352 100644 (file)
--- 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 8a4731b6704f2228d9ee8fef4242f9546cb8cf30..fcd92ae8e41c4082857411c52c67c57514b02a51 100644 (file)
--- 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 $< $@
@@ -1717,7 +1717,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)
@@ -1881,7 +1881,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)
@@ -1968,7 +1968,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
@@ -2022,7 +2022,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 37759149e9ce033a9ab23d19caee667823ab0721..878a1140bf5bc3aa3f7124932930d05cf1c3bdd5 100644 (file)
--- 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