From 06f99c2599db8140bd839532caa8f6ee0d1c3ff6 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Tue, 16 Aug 2022 20:30:39 -0700 Subject: [PATCH] meson: fix docbook2x detection docbook2man can sometimes be docbook2x and other times be docbook-utils. Rather than compare paths, use version constraints to detect version. Signed-off-by: Cameron Nemo --- meson.build | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 666824c5a..2b160d4ac 100644 --- a/meson.build +++ b/meson.build @@ -324,9 +324,6 @@ endif generate_date = run_command(date, '--utc', '--date=@' + time_epoch, '+%Y-%m-%d', check: true).stdout().strip() ## Manpages. -sgml2man = find_program('docbook2X2man', 'docbook2x-man', 'db2x_docbook2man', 'docbook2man', 'docbook-to-man', required: want_mans) -docbook2man = find_program('docbook2man', required: false) - docconf = configuration_data() docconf.set('builddir', '.') docconf.set('BINDIR', bindir) @@ -341,10 +338,15 @@ docconf.set('LXCTEMPLATEDIR', lxctemplatedir) docconf.set('LXC_USERNIC_CONF', lxc_user_network_conf) docconf.set('LXC_USERNIC_DB', lxc_user_network_db) docconf.set('PACKAGE_VERSION', version_data.get('LXC_VERSION')) -if sgml2man.found() and docbook2man.found() and sgml2man.full_path() == docbook2man.full_path() - docconf.set('docdtd', '"-//Davenport//DTD DocBook V3.0//EN"') -else - docconf.set('docdtd', '"-//OASIS//DTD DocBook XML" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"') +docconf.set('docdtd', '"-//OASIS//DTD DocBook XML" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"') +sgml2man = find_program('docbook2X2man', 'docbook2x-man', 'db2x_docbook2man', 'docbook2man', 'docbook-to-man', required: false, version: '>=0.8') +if not sgml2man.found() + sgml2man = find_program('docbook2man', required: false, version: '<0.8') + if sgml2man.found() + docconf.set('docdtd', '"-//Davenport//DTD DocBook V3.0//EN"') + elif want_mans + error('missing required docbook2x or docbook-utils dependency') + endif endif ## Threads. -- 2.47.2