NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Convert HAVE_SANLOCK to WITH_SANLOCK

Browse Source 
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-09-20 12:58:07 +01:00
parent 654c709baa
commit 4da3000c66
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1189,7 +1189,7 @@ if test "x$with_sanlock" != "xno"; then
CPPFLAGS="$old_cppflags" CPPFLAGS="$old_cppflags"
LIBS="$old_libs" LIBS="$old_libs"
if test "x$with_sanlock" = "xyes" ; then 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]) [whether Sanlock plugin for lock management is available])
AC_CHECK_LIB([sanlock_client], [sanlock_killpath], AC_CHECK_LIB([sanlock_client], [sanlock_killpath],
@ -1208,7 +1208,7 @@ if test "x$with_sanlock" != "xno"; then
fi fi
fi 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_CFLAGS])
AC_SUBST([SANLOCK_LIBS]) AC_SUBST([SANLOCK_LIBS])

10
src/Makefile.am
View File

@ -1353,7 +1353,7 @@ else
check-augeas-lxc: check-augeas-lxc:
endif endif
if HAVE_SANLOCK if WITH_SANLOCK
test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
locking/qemu-sanlock.conf $(AUG_GENTEST) locking/qemu-sanlock.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ $(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 $@ mv $@-t $@
if HAVE_SANLOCK if WITH_SANLOCK
lockdriver_LTLIBRARIES += sanlock.la lockdriver_LTLIBRARIES += sanlock.la
sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES)
sanlock_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS) sanlock_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS)
@ -1881,7 +1881,7 @@ endif
EXTRA_DIST += $(STORAGE_HELPER_DISK_SOURCES) EXTRA_DIST += $(STORAGE_HELPER_DISK_SOURCES)
if HAVE_SANLOCK if WITH_SANLOCK
libexec_PROGRAMS += libvirt_sanlock_helper libexec_PROGRAMS += libvirt_sanlock_helper
libvirt_sanlock_helper_SOURCES = $(LOCK_DRIVER_SANLOCK_HELPER_SOURCES) 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/images"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot"
if HAVE_SANLOCK if WITH_SANLOCK
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock"
endif endif
if WITH_QEMU if WITH_QEMU
@ -2022,7 +2022,7 @@ endif
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||:
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||:
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||:
if HAVE_SANLOCK if WITH_SANLOCK
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||:
endif endif
if WITH_QEMU if WITH_QEMU

4
tools/Makefile.am
View File

@ -43,7 +43,7 @@ bin_SCRIPTS = virt-xml-validate virt-pki-validate
bin_PROGRAMS = virsh virt-host-validate bin_PROGRAMS = virsh virt-host-validate
libexec_SCRIPTS = libvirt-guests.sh libexec_SCRIPTS = libvirt-guests.sh
if HAVE_SANLOCK if WITH_SANLOCK
sbin_SCRIPTS = virt-sanlock-cleanup sbin_SCRIPTS = virt-sanlock-cleanup
DISTCLEANFILES += virt-sanlock-cleanup DISTCLEANFILES += virt-sanlock-cleanup
endif endif
@ -53,7 +53,7 @@ dist_man1_MANS = \
virt-pki-validate.1 \ virt-pki-validate.1 \
virt-xml-validate.1 \ virt-xml-validate.1 \
virsh.1 virsh.1
if HAVE_SANLOCK if WITH_SANLOCK
dist_man8_MANS = virt-sanlock-cleanup.8 dist_man8_MANS = virt-sanlock-cleanup.8
endif endif