From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 3 Nov 2021 12:43:34 +0000 (+0100)
Subject: meson: Fix rst2html5 detection
X-Git-Tag: v7.10.0-rc1~233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=958f8fe8c441a8a40f4044e2257c094b9ce07ae4;p=thirdparty%2Flibvirt.git

meson: Fix rst2html5 detection

The first part of the version string contains the name that the
rst2html5 command was invoked as, which can differ based on the
operating system: on FreeBSD, for example, it's rst2html5.py
instead of just rst2html5.

Fix our detection logic so that it works regardless of the
specific name used for the docutils-provided rst2html5 command.

Fixes: cf0c9e186565e886a0016b2b269088b3eed3d26d
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---

diff --git a/meson.build b/meson.build
index 3a9066b9fe..6f5d480c1e 100644
--- a/meson.build
+++ b/meson.build
@@ -836,8 +836,8 @@ endforeach
 # Use this knowledge to detect the version that we know doesn't work
 # for building libvirt and reject it
 rst2html5_version = run_command(rst2html5_prog, '--version')
-rst2html5_version = rst2html5_version.stdout().split('(')
-if rst2html5_version[0] != 'rst2html5 '
+rst2html5_version = rst2html5_version.stdout().split(' ')
+if rst2html5_version[1] != '(Docutils'
   error('Please uninstall the rst2html5 package and install the docutils package')
 endif