From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 10 Aug 2020 16:04:43 +0000 (+0200)
Subject: meson: avoid unstable module warning with Meson 0.56.0 or newer
X-Git-Tag: v5.2.0-rc0~175^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b29b40f4abefa789111a6063b19dde9b276662ff;p=users%2Fdwmw2%2Fqemu.git

meson: avoid unstable module warning with Meson 0.56.0 or newer

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/meson.build b/meson.build
index 62bf8a51c2..808f50b07e 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,11 @@ project('qemu', ['c'], meson_version: '>=0.55.0',
         version: run_command('head', meson.source_root() / 'VERSION').stdout().strip())
 
 not_found = dependency('', required: false)
-keyval = import('unstable-keyval')
+if meson.version().version_compare('>=0.56.0')
+  keyval = import('keyval')
+else
+  keyval = import('unstable-keyval')
+endif
 ss = import('sourceset')
 
 sh = find_program('sh')