From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Brad Smith" <brad@comstyle.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 1/4] audio: use pkg-config
Date: Wed, 23 Jan 2019 09:00:02 +0100 [thread overview]
Message-ID: <20190123080005.31078-2-kraxel@redhat.com> (raw)
In-Reply-To: <20190123080005.31078-1-kraxel@redhat.com>
Use pkg-config to probe for alsa and pulseaudio.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
configure | 39 +++++++++++++--------------------------
1 file changed, 13 insertions(+), 26 deletions(-)
diff --git a/configure b/configure
index 3eee3fcf70..bdb80f8cb1 100755
--- a/configure
+++ b/configure
@@ -3297,39 +3297,26 @@ fi
##########################################
# Sound support libraries probe
-audio_drv_probe()
-{
- drv=$1
- hdr=$2
- lib=$3
- exp=$4
- cfl=$5
- cat > $TMPC << EOF
-#include <$hdr>
-int main(void) { $exp }
-EOF
- if compile_prog "$cfl" "$lib" ; then
- :
- else
- error_exit "$drv check failed" \
- "Make sure to have the $drv libs and headers installed."
- fi
-}
-
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g')
for drv in $audio_drv_list; do
case $drv in
alsa)
- audio_drv_probe $drv alsa/asoundlib.h -lasound \
- "return snd_pcm_close((snd_pcm_t *)0);"
- alsa_libs="-lasound"
+ if $pkg_config alsa --exists; then
+ alsa_libs=$($pkg_config alsa --libs)
+ else
+ error_exit "$drv check failed" \
+ "Make sure to have the $drv libs and headers installed."
+ fi
;;
pa)
- audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \
- "pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL); return 0;"
- pulse_libs="-lpulse"
- audio_pt_int="yes"
+ if $pkg_config libpulse --exists; then
+ pulse_libs=$($pkg_config libpulse --libs)
+ audio_pt_int="yes"
+ else
+ error_exit "$drv check failed" \
+ "Make sure to have the $drv libs and headers installed."
+ fi
;;
sdl)
--
2.9.3
next prev parent reply other threads:[~2019-01-23 8:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-23 8:00 [Qemu-devel] [PATCH 0/4] audio: rework driver probing Gerd Hoffmann
2019-01-23 8:00 ` Gerd Hoffmann [this message]
2019-01-23 8:30 ` [Qemu-devel] [PATCH 1/4] audio: use pkg-config Thomas Huth
2019-01-23 8:00 ` [Qemu-devel] [PATCH 2/4] audio: allow optional audio drivers Gerd Hoffmann
2019-01-23 8:00 ` [Qemu-devel] [PATCH 3/4] audio: use try-sdl and try-pa for openbsd Gerd Hoffmann
2019-01-23 8:00 ` [Qemu-devel] [PATCH 4/4] [RfC] audio: probe audio drivers by default Gerd Hoffmann
2019-01-23 8:27 ` Thomas Huth
2019-01-23 9:36 ` Daniel P. Berrangé
2019-01-23 9:50 ` Thomas Huth
2019-01-23 10:12 ` Daniel P. Berrangé
2019-01-23 10:36 ` Kamil Rytarowski
2019-01-23 10:59 ` Peter Maydell
2019-01-23 11:10 ` Kamil Rytarowski
2019-01-23 11:16 ` Peter Maydell
2019-01-23 11:30 ` Kamil Rytarowski
2019-01-23 12:20 ` Gerd Hoffmann
2019-01-23 12:45 ` Kamil Rytarowski
2019-01-23 13:59 ` Gerd Hoffmann
2019-01-23 14:45 ` Kamil Rytarowski
2019-01-23 14:54 ` Brad Smith
2019-01-23 15:12 ` Gerd Hoffmann
2019-01-23 15:20 ` Kamil Rytarowski
2019-01-24 6:38 ` Gerd Hoffmann
2019-01-24 6:51 ` Thomas Huth
2019-01-24 10:06 ` Kamil Rytarowski
2019-01-23 10:16 ` Kamil Rytarowski
2019-01-23 10:24 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190123080005.31078-2-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=brad@comstyle.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).