From: Thomas Huth <thuth@redhat.com>
Date: Tue, 2 Nov 2021 10:58:22 +0000 (+0100)
Subject: meson.build: Allow to disable OSS again
X-Git-Tag: qemu-xen-4.17.0-rc4~244^2~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ab486f165b882aa5b02d0b48d6fa242a2d3c10da;p=qemu-xen.git

meson.build: Allow to disable OSS again

If sys/soundcard.h is available, it is currently not possible to
disable OSS with the --disable-oss or --without-default-features
configure switches. Improve the check in meson.build to fix this.

Fixes: 87430d5b13 ("configure, meson: move audio driver detection to Meson")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20211102105822.773131-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/meson.build b/meson.build
index 85f1e43dfe..0ab9c43bf2 100644
--- a/meson.build
+++ b/meson.build
@@ -911,7 +911,7 @@ if liblzfse.found() and not cc.links('''
 endif
 
 oss = not_found
-if not get_option('oss').auto() or have_system
+if have_system and not get_option('oss').disabled()
   if not cc.has_header('sys/soundcard.h')
     # not found
   elif targetos == 'netbsd'