configure.ac: OSS portability

Original commit message from CVS:
* configure.ac: OSS portability
* ext/arts/gst_arts.c: idem
* sys/oss/gstosselement.c: idem
* sys/oss/gstossmixer.c: idem
* sys/oss/gstosssink.c: idem
* sys/oss/gstosssrc.c: idem
* sys/oss/oss_probe.c: idem
- check for soundcard.h in different places for some BSD

diff --git a/ChangeLog b/ChangeLog
index e1f125e..d5192f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-07  Stephane Loeuillet  <stephane.loeuillet@tiscali.fr>
+
+       * configure.ac: OSS portability
+       * ext/arts/gst_arts.c: idem
+       * sys/oss/gstosselement.c: idem
+       * sys/oss/gstossmixer.c: idem
+       * sys/oss/gstosssink.c: idem
+       * sys/oss/gstosssrc.c: idem
+       * sys/oss/oss_probe.c: idem
+         - check for soundcard.h in different places for some BSD
+
 2004-06-07  Jan Schmidt <thaytan@mad.scientist.com>
        * AUTHORS:
        Add me to the authors file

diff --git a/configure.ac b/configure.ac
index f33696f..9503b9f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -446,10 +446,26 @@ GST_CHECK_FEATURE(DXR3, [DXR3 hardware MPEG DVD decoder],
                     HAVE_DXR3=no ] )
 ])
 
-dnl *** OSS audio ***
+dnl *** OSS audio *** (Linux, *BSD)
 translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
 GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
-  AC_CHECK_HEADER(sys/soundcard.h, HAVE_OSS="yes", HAVE_OSS="no")
+  HAVE_OSS="yes"
+  dnl Linux and newer BSD versions :
+  AC_CHECK_HEADER(sys/soundcard.h, [
+    AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/])
+    ] , [
+    dnl Some old BSD versions :
+    AC_CHECK_HEADER(soundcard.h, [
+      AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /])
+      ], [
+      dnl Some old BSD versions :
+      AC_CHECK_HEADER(machine/soundcard.h, [
+        AC_DEFINE(HAVE_OSS_INCLUDE_IN_MACHINE,, [Define if OSS includes are in /machine/])
+        ], [
+        HAVE_OSS="no"
+      ])
+    ])
+  ])
 ])
 
 dnl *** OS X audio ***