From nobody Sat Sep 28 23:02:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548257025636267.15276901429866; Wed, 23 Jan 2019 07:23:45 -0800 (PST) Received: from localhost ([127.0.0.1]:36743 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKNP-0000vu-LL for importer@patchew.org; Wed, 23 Jan 2019 10:23:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKLb-0008Fk-MR for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:21:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmKLZ-0008Fv-An for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:21:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39656) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmKLY-00086K-8K for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:21:44 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DCECB3B722; Wed, 23 Jan 2019 15:21:22 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F7C5261D2; Wed, 23 Jan 2019 15:21:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 453C4A1E9; Wed, 23 Jan 2019 16:21:12 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 16:21:07 +0100 Message-Id: <20190123152112.15757-2-kraxel@redhat.com> In-Reply-To: <20190123152112.15757-1-kraxel@redhat.com> References: <20190123152112.15757-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 23 Jan 2019 15:21:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/6] audio: use pkg-config X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use pkg-config to probe for alsa and pulseaudio. Signed-off-by: Gerd Hoffmann --- configure | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/configure b/configure index de768e2343..0af38f0cec 100755 --- a/configure +++ b/configure @@ -3303,39 +3303,26 @@ fi ########################################## # Sound support libraries probe =20 -audio_drv_probe() -{ - drv=3D$1 - hdr=3D$2 - lib=3D$3 - exp=3D$4 - cfl=3D$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=3D$(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=3D"-lasound" + if $pkg_config alsa --exists; then + alsa_libs=3D$($pkg_config alsa --libs) + else + error_exit "$drv check failed" \ + "Make sure to have the $drv libs and headers installed." + fi ;; =20 pa) - audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \ - "pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL); r= eturn 0;" - pulse_libs=3D"-lpulse" - audio_pt_int=3D"yes" + if $pkg_config libpulse --exists; then + pulse_libs=3D$($pkg_config libpulse --libs) + audio_pt_int=3D"yes" + else + error_exit "$drv check failed" \ + "Make sure to have the $drv libs and headers installed." + fi ;; =20 sdl) --=20 2.9.3