summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-02-28 16:11:18 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-02-28 16:11:18 +0000
commit21ee7686d7b63c3e58a7ccab33315a8c543c7171 (patch)
treef6ed87b184270c3deaaa4ab2851e9bb039c53219 /configure
parent711d13d5e2e160c1c3bcbd302af6df3980a99469 (diff)
parent9399ef168377d9e7f2e33b1c2eb61751aa1b72fa (diff)
downloadqemu-21ee7686d7b63c3e58a7ccab33315a8c543c7171.zip
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20190228-pull-request' into staging
audio: fixes and cleanups. # gpg: Signature made Thu 28 Feb 2019 10:08:44 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/audio-20190228-pull-request: audio/sdlaudio: Simplify the sdl_callback function audio/sdlaudio: Remove the semaphore code audio: don't build alsa and sdl by default on linux audio: Do not check for audio_calloc failure audio: Use g_strdup_printf instead of manual building a string Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 694088a4ec..540bee19ba 100755
--- a/configure
+++ b/configure
@@ -879,7 +879,7 @@ Haiku)
LIBS="-lposix_error_mapper -lnetwork $LIBS"
;;
Linux)
- audio_drv_list="try-pa try-alsa try-sdl oss"
+ audio_drv_list="try-pa oss"
audio_possible_drivers="oss alsa sdl pa"
linux="yes"
linux_user="yes"