]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
meson.build: Allow to disable OSS again
authorThomas Huth <thuth@redhat.com>
Tue, 2 Nov 2021 10:58:22 +0000 (11:58 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 2 Nov 2021 14:57:28 +0000 (15:57 +0100)
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>
meson.build

index 85f1e43dfe604f2b2f3bcbdfd2150c1d71bad890..0ab9c43bf2437c2a09ea8a02637ef45be2571abd 100644 (file)
@@ -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'