From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 28 Aug 2008 14:11:55 +0000 (+0100)
Subject: Drop duplication opengl configuration flags
X-Git-Tag: t.master-before-merge~105
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ae6c754836d244cdb3fe461853e774f1e7c5a33c;p=qemu-xen-4.0-testing.git

Drop duplication opengl configuration flags

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

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
diff --git a/configure b/configure
index a6ad0063..01f05f4e 100755
--- a/configure
+++ b/configure
@@ -1118,14 +1118,6 @@ then
     echo "SDL_LIBS+=-lXext" >> $config_mak
     echo "SDL_LIBS+=-lGL" >> $config_mak
 fi
-if test "$opengl" = "yes"
-then
-    echo "#define CONFIG_OPENGL 1" >> $config_h
-    echo "CONFIG_OPENGL=yes" >> $config_mak
-    echo "SDL_CFLAGS+=-I/usr/include/GL" >> $config_mak
-    echo "SDL_LIBS+=-lXext" >> $config_mak
-    echo "SDL_LIBS+=-lGL" >> $config_mak
-fi
 if test "$cocoa" = "yes" ; then
   echo "#define CONFIG_COCOA 1" >> $config_h
   echo "CONFIG_COCOA=yes" >> $config_mak