From patchwork Mon Aug 3 12:46:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30571 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id AEC00B6F1F for ; Tue, 4 Aug 2009 01:25:19 +1000 (EST) Received: from localhost ([127.0.0.1]:46286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXzPW-0001lx-IE for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 11:25:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXx02-0003xP-51 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwzx-0003u9-86 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:45 -0400 Received: from [199.232.76.173] (port=51733 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzw-0003tm-QO for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:40 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40905) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzw-0007DQ-70 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:40 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73CodXi007438; Mon, 3 Aug 2009 08:50:39 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73CocE2027016; Mon, 3 Aug 2009 08:50:38 -0400 Received: from localhost.localdomain (vpn-12-117.rdu.redhat.com [10.11.12.117]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cn8NC009715; Mon, 3 Aug 2009 08:50:37 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:59 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 68/81] Generate CONFIG_AUDIO_PT_INT in configure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- Makefile | 8 +------- configure | 6 ++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index df8fb0e..09d9ed0 100644 --- a/Makefile +++ b/Makefile @@ -96,12 +96,6 @@ obj-$(CONFIG_WIN32) += tap-win32.o obj-$(CONFIG_POSIX) += migration-exec.o audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS) -ifdef CONFIG_ESD -AUDIO_PT_INT = y -endif -ifdef CONFIG_PA -AUDIO_PT_INT = y -endif audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o audio-obj-$(CONFIG_SDL) += sdlaudio.o @@ -112,7 +106,7 @@ audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o audio-obj-$(CONFIG_FMOD) += fmodaudio.o audio-obj-$(CONFIG_ESD) += esdaudio.o audio-obj-$(CONFIG_PA) += paaudio.o -audio-obj-$(AUDIO_PT_INT) += audio_pt_int.o +audio-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o audio-obj-y += wavcapture.o obj-y += $(addprefix audio/, $(audio-obj-y)) diff --git a/configure b/configure index 9d54aaa..9bc2303 100755 --- a/configure +++ b/configure @@ -46,6 +46,7 @@ objcopy="objcopy" ld="ld" helper_cflags="" libs_softmmu="" +audio_pt_int="" # parse CC options first for opt do @@ -1011,12 +1012,14 @@ for drv in $audio_drv_list; do esd) audio_drv_probe $drv esd.h -lesd 'return esd_play_stream(0, 0, "", 0);' libs_softmmu="-lesd $libs_softmmu" + audio_pt_int="yes" ;; pa) audio_drv_probe $drv pulse/simple.h -lpulse-simple \ "pa_simple *s = NULL; pa_simple_free(s); return 0;" libs_softmmu="-lpulse-simple $libs_softmmu" + audio_pt_int="yes" ;; coreaudio) @@ -1622,6 +1625,9 @@ for drv in $audio_drv_list; do echo "FMOD_CFLAGS=-I$fmod_inc" >> $config_host_mak fi done +if test "$audio_pt_int" = "yes" ; then + echo "CONFIG_AUDIO_PT_INT=y" >> $config_host_mak +fi if test "$mixemu" = "yes" ; then echo "CONFIG_MIXEMU=y" >> $config_host_mak fi