From 4e2bc45bcb84f486cd4a6b28d43e5111c851e37f Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@lokigames.com>
Date: Wed, 23 May 2001 00:36:17 +0000
Subject: [PATCH] Added detection of Open Sound System on Solaris x86

---
 configure.in                 | 19 +++++--------------
 docs.html                    |  1 +
 src/audio/SDL_audio.c        |  9 ++++-----
 src/audio/SDL_sysaudio.h     |  9 ++++-----
 src/audio/dma/SDL_dmaaudio.c | 14 --------------
 src/audio/dsp/SDL_dspaudio.c | 14 --------------
 6 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/configure.in b/configure.in
index 81bc8f95b..46534a54a 100644
--- a/configure.in
+++ b/configure.in
@@ -242,21 +242,7 @@ CheckOSS()
         AC_MSG_CHECKING(for OSS audio support)
         have_oss=no
         AC_TRY_COMPILE([
-          #ifdef linux
-          #include <linux/soundcard.h>
-          #endif
-          #ifdef __FreeBSD__
-          #include <machine/soundcard.h>
-          #endif
-          #ifdef __bsdi__
-          #include <sys/soundcard.h>
-          #endif
-          #ifdef __OpenBSD__
-          #include <soundcard.h>
-          #endif
-          #ifdef __USLC__
           #include <sys/soundcard.h>
-          #endif
         ],[
 	  int arg = SNDCTL_DSP_SETFRAGMENT;
         ],[
@@ -1146,6 +1132,8 @@ case "$target" in
         CheckDummyVideo
         CheckNASM
         CheckOSS
+        CheckARTSC
+        CheckESD
         CheckNAS
         CheckX11
         CheckDGA
@@ -1386,6 +1374,7 @@ case "$target" in
         CFLAGS="$CFLAGS -D__ELF__" # Fix for nasm on Solaris x86
         CheckDummyVideo
         CheckNASM
+        CheckOSS
         CheckARTSC
         CheckESD
         CheckNAS
@@ -1488,6 +1477,7 @@ case "$target" in
     *-*-hpux*)
         ARCH=hpux
         CheckDummyVideo
+        CheckOSS
         CheckNAS
         CheckX11
         CheckGGI
@@ -1531,6 +1521,7 @@ case "$target" in
     *-*-aix*)
         ARCH=aix
         CheckDummyVideo
+        CheckOSS
         CheckNAS
         CheckX11
         CheckGGI
diff --git a/docs.html b/docs.html
index c51be1903..89ede8de5 100644
--- a/docs.html
+++ b/docs.html
@@ -16,6 +16,7 @@ <H2>
 Major changes since SDL 1.0.0:
 </H2>
 <UL>
+	<LI> 1.2.1: Added detection of Open Sound System on Solaris x86
 	<LI> 1.2.1: Added initial support for Nano-X (thanks Hsieh-Fu!)
 	<LI> 1.2.1: Fixed endian detection on IA64 architectures (thanks Bill!)
 	<LI> 1.2.1: Added --disable-dga configure option to disable DGA
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index e96f63dca..0e3fb1192 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -40,11 +40,6 @@ static char rcsid =
 
 /* Available audio drivers */
 static AudioBootStrap *bootstrap[] = {
-#if defined(unix) && \
-   !defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \
-   && !defined(__bsdi__)
-	&AUDIO_bootstrap,
-#endif
 #ifdef OSS_SUPPORT
 	&DSP_bootstrap,
 	&DMA_bootstrap,
@@ -52,6 +47,10 @@ static AudioBootStrap *bootstrap[] = {
 #ifdef ALSA_SUPPORT
 	&ALSA_bootstrap,
 #endif
+#if (defined(unix) && !defined(__CYGWIN32__)) && \
+    !defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
+	&AUDIO_bootstrap,
+#endif
 #ifdef ARTSC_SUPPORT
 	&ARTSC_bootstrap,
 #endif
diff --git a/src/audio/SDL_sysaudio.h b/src/audio/SDL_sysaudio.h
index 32db77ec4..43f237c1c 100644
--- a/src/audio/SDL_sysaudio.h
+++ b/src/audio/SDL_sysaudio.h
@@ -99,11 +99,6 @@ typedef struct AudioBootStrap {
 	SDL_AudioDevice *(*create)(int devindex);
 } AudioBootStrap;
 
-#if defined(unix) && \
-   !defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \
-   && !defined(__bsdi__)
-extern AudioBootStrap AUDIO_bootstrap;
-#endif
 #ifdef OSS_SUPPORT
 extern AudioBootStrap DSP_bootstrap;
 extern AudioBootStrap DMA_bootstrap;
@@ -111,6 +106,10 @@ extern AudioBootStrap DMA_bootstrap;
 #ifdef ALSA_SUPPORT
 extern AudioBootStrap ALSA_bootstrap;
 #endif
+#if (defined(unix) && !defined(__CYGWIN32__)) && \
+    !defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
+extern AudioBootStrap AUDIO_bootstrap;
+#endif
 #ifdef ARTSC_SUPPORT
 extern AudioBootStrap ARTSC_bootstrap;
 #endif
diff --git a/src/audio/dma/SDL_dmaaudio.c b/src/audio/dma/SDL_dmaaudio.c
index d235de798..2a3354da9 100644
--- a/src/audio/dma/SDL_dmaaudio.c
+++ b/src/audio/dma/SDL_dmaaudio.c
@@ -39,21 +39,7 @@ static char rcsid =
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#ifdef linux
-#include <linux/soundcard.h>
-#endif
-#ifdef __bsdi__
-#include <sys/soundcard.h>
-#endif
-#ifdef __FreeBSD__
-#include <machine/soundcard.h>
-#endif
-#ifdef __OpenBSD__
-#include <soundcard.h>
-#endif
-#ifdef __USLC__
 #include <sys/soundcard.h>
-#endif
 
 #ifndef MAP_FAILED
 #define MAP_FAILED	((Uint8 *)-1)
diff --git a/src/audio/dsp/SDL_dspaudio.c b/src/audio/dsp/SDL_dspaudio.c
index 5b7a39608..1ff1bea1e 100644
--- a/src/audio/dsp/SDL_dspaudio.c
+++ b/src/audio/dsp/SDL_dspaudio.c
@@ -37,21 +37,7 @@ static char rcsid =
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#ifdef linux
-#include <linux/soundcard.h>
-#endif
-#ifdef __bsdi__
-#include <sys/soundcard.h>
-#endif
-#ifdef __FreeBSD__
-#include <machine/soundcard.h>
-#endif
-#ifdef __OpenBSD__
-#include <soundcard.h>
-#endif
-#ifdef __USLC__
 #include <sys/soundcard.h>
-#endif
 
 #include "SDL_audio.h"
 #include "SDL_error.h"