aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-01-24 12:20:51 +0100
committerGerd Hoffmann <kraxel@redhat.com>2019-01-24 13:11:08 +0100
commite42975a153dc7d1d281b67dd31a4998d8df475f7 (patch)
treec4db4027af7382a1f97dc5ba242442d19227682a
parentc80a867fa06ec1dcc8fe3460a8295160d68b8608 (diff)
downloadqemu-e42975a153dc7d1d281b67dd31a4998d8df475f7.zip
qemu-e42975a153dc7d1d281b67dd31a4998d8df475f7.tar.gz
qemu-e42975a153dc7d1d281b67dd31a4998d8df475f7.tar.bz2
audio: allow optional audio drivers.
For those audio drivers which can be probed (sdl, alsa, pulse) add a try-$name variants. Unlike the variants without try- prefix they will not error out on probe failure, the driver will be dropped from the list instead. Mainly useful for the audio_drv_list default values. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20190124112055.547-3-kraxel@redhat.com
-rwxr-xr-xconfigure34
1 files changed, 28 insertions, 6 deletions
diff --git a/configure b/configure
index 5fcd0f4..6a2aa3b 100755
--- a/configure
+++ b/configure
@@ -3345,22 +3345,36 @@ fi
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g')
for drv in $audio_drv_list; do
case $drv in
- alsa)
+ alsa | try-alsa)
if $pkg_config alsa --exists; then
alsa_libs=$($pkg_config alsa --libs)
+ if test "$drv" = "try-alsa"; then
+ audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-alsa/alsa/')
+ fi
else
- error_exit "$drv check failed" \
- "Make sure to have the $drv libs and headers installed."
+ if test "$drv" = "try-alsa"; then
+ audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-alsa//')
+ else
+ error_exit "$drv check failed" \
+ "Make sure to have the $drv libs and headers installed."
+ fi
fi
;;
- pa)
+ pa | try-pa)
if $pkg_config libpulse --exists; then
pulse_libs=$($pkg_config libpulse --libs)
audio_pt_int="yes"
+ if test "$drv" = "try-pa"; then
+ audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-pa/pa/')
+ fi
else
- error_exit "$drv check failed" \
- "Make sure to have the $drv libs and headers installed."
+ if test "$drv" = "try-pa"; then
+ audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-pa//')
+ else
+ error_exit "$drv check failed" \
+ "Make sure to have the $drv libs and headers installed."
+ fi
fi
;;
@@ -3370,6 +3384,14 @@ for drv in $audio_drv_list; do
fi
;;
+ try-sdl)
+ if test "$sdl" = "no"; then
+ audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-sdl//')
+ else
+ audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-sdl/sdl/')
+ fi
+ ;;
+
coreaudio)
coreaudio_libs="-framework CoreAudio"
;;