This patch adds support for 4Front Technologies commercial Open Sound

System (TM) driver for NetBSD and OpenBSD. Also, it stops unnecesarily
pulling in the libossaudio compatibility library on NetBSD when
ossaudio is disabled, as is already done on OpenBSD. (Other systems
don't have a compatibility layer; they either have OSS audio in the
kernel or they don't, so they wouldn't be affected.) Patch was
committed to NetBSD pkgsrc by Johny C. Lam <jlam@netbsd.org>.
Frederick Bruckman <fredb@immanent.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9023 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 15 insertions, 3 deletions

diff --git a/configure b/configure
index 526ee5a0c8..a399005b51 100755
--- a/configure
+++ b/configure
@@ -3198,9 +3198,22 @@ if test "$_ossaudio" = yes ; then
     _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound/dsp"'
     _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/sound/mixer"'
   else
-     if netbsd || openbsd ; then
+     cat > $TMPC << EOF
+#include <sys/ioctl.h>
+$_inc_soundcard
+#ifdef OPEN_SOUND_SYSTEM
+int main(void) { return 0; }
+#else
+#error Not the real thing
+#endif
+EOF
+     _real_ossaudio=no
+     cc_check && _real_ossaudio=yes
+     if test "$_real_ossaudio" = yes; then
+       _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
+     elif netbsd || openbsd ; then
        _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"'
-       openbsd && _ld_arch="$_ld_arch -lossaudio"
+       _ld_arch="$_ld_arch -lossaudio"
      else
        _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
      fi
@@ -4681,7 +4694,6 @@ test "$_real" = yes && _ld_dl_dynamic='-rdynamic'
 _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic"
 bsdos && _ld_arch="$_ld_arch -ldvd"
 if netbsd ; then
-  _ld_arch="$_ld_arch -lossaudio"
   x86 && _ld_arch="$_ld_arch -li386"
 fi