From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 15 Apr 2021 12:36:32 +0000 (+0200)
Subject: meson: don't check collie as program for sheepdog
X-Git-Tag: v7.3.0-rc1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e88184b8e2a8c4a1eefd805617bf8c5be381916;p=thirdparty%2Flibvirt.git

meson: don't check collie as program for sheepdog

Upstream sheepdog changed collie to dog back in 2013 in version 0.7.0.
Looking into repology that version is no longer used by any distribution
supported by libvirt.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/meson.build b/meson.build
index cd88e26f9a..837955de37 100644
--- a/meson.build
+++ b/meson.build
@@ -1927,7 +1927,7 @@ if conf.has('WITH_LIBVIRTD')
   endif
 
   if not get_option('storage_sheepdog').disabled()
-    sheepdogcli_prog = find_program(['collie', 'dog'], required: get_option('storage_sheepdog'), dirs: libvirt_sbin_path)
+    sheepdogcli_prog = find_program('dog', required: get_option('storage_sheepdog'), dirs: libvirt_sbin_path)
 
     if sheepdogcli_prog.found()
       use_storage = true