From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 25 Sep 2008 10:12:03 +0000 (+0100)
Subject: Fix broken audio support.
X-Git-Tag: xen-3.3.1-rc1~9
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f70e8ad4b0d34278c91c40aca20716fd66c73bba;p=qemu-xen-3.3-testing.git

Fix broken audio support.

-DHAS_AUDIO_CHOICE was omitted from CPPFLAGS.

This change was committed as one hunk of

    commit ae6c754836d244cdb3fe461853e774f1e7c5a33c
    Author: Ian Jackson <ian.jackson@eu.citrix.com>
    Date:   Thu Aug 28 15:11:55 2008 +0100

	Drop duplication opengl configuration flags

	Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

although this was probably a mistake; it should have been committed
separately.  In any case we cherry pick that half of the change now.
---

diff --git a/Makefile.target b/Makefile.target
index 1aace9c4..57770336 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -559,7 +559,7 @@ ifeq ($(TARGET_BASE_ARCH), i386)
 # Hardware support
 ifdef CONFIG_AUDIO
 OBJS+= $(SOUND_HW) pcspk.o
-CPPFLAGS += -DHAS_AUDIO
+CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif
 OBJS+= ide.o pckbd.o ps2.o vga.o dma.o
 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o