qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Brad Smith <brad@comstyle.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 2/7] audio: use pkg-config
Date: Thu, 24 Jan 2019 14:20:15 +0100	[thread overview]
Message-ID: <20190124132020.13571-3-kraxel@redhat.com> (raw)
In-Reply-To: <20190124132020.13571-1-kraxel@redhat.com>

Use pkg-config to probe for alsa and pulseaudio.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190124112055.547-2-kraxel@redhat.com
---
 configure | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/configure b/configure
index 8f312ac3e2..5fcd0f4795 100755
--- a/configure
+++ b/configure
@@ -3342,39 +3342,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

  parent reply	other threads:[~2019-01-24 13:20 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-24 13:20 [Qemu-devel] [PULL 0/7] Audio 20190124 patches Gerd Hoffmann
2019-01-24 13:20 ` [Qemu-devel] [PULL 1/7] audio: fix pc speaker init Gerd Hoffmann
2019-02-12 11:47   ` David Hildenbrand
2019-02-12 12:08     ` Philippe Mathieu-Daudé
2019-02-12 12:20       ` David Hildenbrand
2019-02-12 12:25         ` David Hildenbrand
2019-01-24 13:20 ` Gerd Hoffmann [this message]
2019-01-24 13:20 ` [Qemu-devel] [PULL 3/7] audio: allow optional audio drivers Gerd Hoffmann
2019-01-24 13:20 ` [Qemu-devel] [PULL 4/7] audio: use try-sdl for openbsd Gerd Hoffmann
2019-01-24 13:20 ` [Qemu-devel] [PULL 5/7] audio: check for pulseaudio daemon pidfile Gerd Hoffmann
2019-01-24 13:20 ` [Qemu-devel] [PULL 6/7] audio: error message tweak Gerd Hoffmann
2019-01-24 13:20 ` [Qemu-devel] [PULL 7/7] audio: probe audio drivers by default Gerd Hoffmann
2019-02-15 14:46   ` Daniel P. Berrangé
2019-01-25 11:51 ` [Qemu-devel] [PULL 0/7] Audio 20190124 patches Peter Maydell

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=20190124132020.13571-3-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=brad@comstyle.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).