diff options
| author | Stéphane Loeuillet <gstreamer@leroutier.net> | 2004-06-07 13:40:07 +0000 |
|---|---|---|
| committer | Stéphane Loeuillet <gstreamer@leroutier.net> | 2004-06-07 13:40:07 +0000 |
| commit | 2a6e591f90db27bcdbd8672992fe9f95e018c1f9 (patch) | |
| tree | b26fe8238ccad353cfb39112fe58f528e751f1b5 | |
| parent | c4ce805afa52e3ec5bb1021d9d71cfc787d8f318 (diff) | |
| download | gst-plugins-bad-2a6e591f90db27bcdbd8672992fe9f95e018c1f9.tar.gz gst-plugins-bad-2a6e591f90db27bcdbd8672992fe9f95e018c1f9.tar.bz2 gst-plugins-bad-2a6e591f90db27bcdbd8672992fe9f95e018c1f9.zip | |
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
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | ext/arts/gst_arts.c | 14 |
3 files changed, 43 insertions, 2 deletions
@@ -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 f33696f0..9503b9fc 100644 --- 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 *** diff --git a/ext/arts/gst_arts.c b/ext/arts/gst_arts.c index 332e33e8..64ff2317 100644 --- a/ext/arts/gst_arts.c +++ b/ext/arts/gst_arts.c @@ -22,7 +22,21 @@ #endif #include <string.h> #include <math.h> + +#ifdef HAVE_OSS_INCLUDE_IN_SYS #include <sys/soundcard.h> +#else + +#ifdef HAVE_OSS_INCLUDE_IN_ROOT +#include <soundcard.h> +#else + +#include <machine/soundcard.h> + +#endif /* HAVE_OSS_INCLUDE_IN_ROOT */ + +#endif /* HAVE_OSS_INCLUDE_IN_SYS */ + /*#define DEBUG_ENABLED */ #include "gst_arts.h" |