[Qemu-devel] [PATCH 02/20] move the decision of using threads or not in audio from Makefile to configure

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile  |   17 ++---------------
 configure |   11 +++++++++++
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index b62d8a0..5a2570e 100644
--- a/Makefile
+++ b/Makefile
@@ -102,23 +102,10 @@ else
 obj-y += migration-exec.o
 endif

-ifdef CONFIG_COREAUDIO
-AUDIO_PT = y
-endif
 ifdef CONFIG_FMOD
 audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(FMOD_CFLAGS) $(CPPFLAGS)
 endif
-ifdef CONFIG_ESD
-AUDIO_PT = y
-AUDIO_PT_INT = y
-endif
-ifdef CONFIG_PA
-AUDIO_PT = y
-AUDIO_PT_INT = y
-endif
-ifdef AUDIO_PT
-LDFLAGS += -pthread
-endif
+

 audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
 audio-obj-$(CONFIG_SDL) += sdlaudio.o
@@ -129,7 +116,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 4317b2f..4c478a1 100755
--- a/configure
+++ b/configure
@@ -1627,13 +1627,24 @@ for drv in $audio_drv_list; do
     elif test "$drv" = "dsound"; then
         LIBS="$LIBS -lole32 -ldxguid"
     elif test "$drv" = "pa"; then
+        audio_pt="yes"
+        audio_pt_int="yes"
         LIBS="$LIBS -lpulse-simple"
     elif test "$drv" = "esd"; then
+        audio_pt="yes"
+        audio_pt_int="yes"
         LIBS="$LIBS -lesd"
     elif test "$drv" = "coreaudio"; then
+        audio_pt="yes"
        LIBS="$LIBS -framework CoreAudio"
     fi
 done
+if test "$audio_pt" == "yes" ; then
+  LDFLAGS="$LDFLAGS -pthread"
+fi
+if test "$audio_pt_int" == "yes" ; then
+  echo "CONFIG_AUDIO_PT_INT=y" >> $config_host_mak
+fi
 echo "" >>$config_host_h
 if test "$mixemu" = "yes" ; then
   echo "CONFIG_MIXEMU=y" >> $config_host_mak
-- 
1.6.2.5