From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Gerd Hoffmann 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> Subject: [Qemu-devel] [PATCH v2 1/6] audio: use pkg-config List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Brad Smith , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann 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 -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