New --disable-audio configure option.

This disables all audio support including drivers and -DHAS_AUDIO.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Makefile b/Makefile
index 103aaf84ca16b6813fd3d29e540ce4cd93f22dae..75f9ada528dd3b3a66e5cca805ea8f27355dbda7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,9 @@ ifdef AUDIO_PT_INT
 AUDIO_OBJS += audio_pt_int.o
 endif
 AUDIO_OBJS+= wavcapture.o
+ifdef CONFIG_AUDIO
 OBJS+=$(addprefix audio/, $(AUDIO_OBJS))
+endif
 
 ifdef CONFIG_SDL
 OBJS+=sdl.o x_keymap.o

diff --git a/Makefile.target b/Makefile.target
index 310de1e72d2fd005c73f21e27f21e691d36dee62..1ed242c0212c04546389d4b1afc9e4db591ebec9 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -554,11 +554,14 @@ OBJS += e1000.o
 
 ifeq ($(TARGET_BASE_ARCH), i386)
 # Hardware support
-OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o
-OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
+ifdef CONFIG_AUDIO
+OBJS+= $(SOUND_HW) pcspk.o
+CPPFLAGS += -DHAS_AUDIO
+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
 OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o
-CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif
 ifeq ($(TARGET_BASE_ARCH), ppc)
 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE

diff --git a/configure b/configure
index 99bb935dc828f1b3d5246ba1dbf28017668716f2..97aad44f739b8d6e8c9b7637149f1053c762c881 100755 (executable)
--- a/configure
+++ b/configure
@@ -87,6 +87,7 @@ mingw32="no"
 EXESUF=""
 gdbstub="yes"
 slirp="yes"
+audio="yes"
 adlib="no"
 ac97="no"
 gus="no"
@@ -281,6 +282,8 @@ for opt do
   ;;
   --disable-slirp) slirp="no"
   ;;
+  --disable-audio) audio="no"
+  ;;
   --enable-adlib) adlib="yes"
   ;;
   --enable-ac97) ac97="yes"
@@ -413,6 +416,7 @@ echo "  --disable-werror         disable compilation abort on warning"
 echo "  --disable-sdl            disable SDL"
 echo "  --enable-cocoa           enable COCOA (Mac OS X only)"
 echo "  --enable-mingw32         enable Win32 cross compilation with mingw32"
+echo "  --disable-audio          disable all audio emulation"
 echo "  --enable-adlib           enable Adlib emulation"
 echo "  --enable-ac97            enable AC97 emulation"
 echo "  --enable-gus             enable Gravis Ultrasound emulation"
@@ -805,6 +809,7 @@ if test "$sdl" != "no" ; then
 fi
 echo "curses support    $curses"
 echo "mingw32 support   $mingw32"
+echo "Audio support     $audio"
 echo "Adlib support     $adlib"
 echo "AC97 support      $ac97"
 echo "GUS support       $gus"
@@ -1003,6 +1008,10 @@ if test "$slirp" = "yes" ; then
   echo "CONFIG_SLIRP=yes" >> $config_mak
   echo "#define CONFIG_SLIRP 1" >> $config_h
 fi
+if test "$audio" = "yes" ; then
+  echo "CONFIG_AUDIO=yes" >> $config_mak
+  echo "#define CONFIG_AUDIO 1" >> $config_h
+fi
 if test "$adlib" = "yes" ; then
   echo "CONFIG_ADLIB=yes" >> $config_mak
   echo "#define CONFIG_ADLIB 1" >> $config_h