[libvirt PATCH] docs/manpages/meson: fix sanlock detection

In meson.build we define sanlock_dep only if it is available but in addition we add 'WITH_SANLOCK' into conf. Use the presence of 'WITH_SANLOCK' in conf to figure out if we need to install virt-sanlock-cleanup man page. Reported-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- docs/manpages/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index 97133adf3a..8295e9e5ea 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -17,7 +17,7 @@ docs_man_files = [ { 'name': 'virt-xml-validate', 'section': '1', 'install': true }, { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, - { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': sanlock_dep.found() }, + { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('WITH_SANLOCK') }, { 'name': 'virtlockd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'virtlogd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, ] -- 2.26.2

On Wed, Aug 05, 2020 at 10:07:44AM +0200, Pavel Hrdina wrote:
In meson.build we define sanlock_dep only if it is available but in addition we add 'WITH_SANLOCK' into conf. Use the presence of 'WITH_SANLOCK' in conf to figure out if we need to install virt-sanlock-cleanup man page.
Reported-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- Reviewed-by: Erik Skultety <eskultet@redhat.com>
participants (2)
-
Erik Skultety
-
Pavel Hrdina