--- configure.in.orig	Tue Mar 16 16:20:39 2004
+++ configure.in	Thu Aug  9 17:02:45 2007
@@ -205,6 +205,16 @@ if test "x$enable_local_sound" = "xyes"; then
       esac
    fi
 
+   if test "${ac_cv_header_sys_audioio_h}" = "yes"; then
+      case ${host_os} in
+      openbsd* | netbsd*)
+         found_sound=yes
+         DRIVER_SUN=1
+         AC_DEFINE(DRIVER_SUN)
+         ;;
+      esac
+   fi
+
    case ${host_os} in
    os2*)
       found_sound=yes
@@ -263,7 +273,9 @@ if test "x$enable_local_sound" = "xyes"; then
    echo "---------------------------------------------------------------------"
    echo "--- Checking to see which audio libraries are required for linking.";
    echo "--- Most of these checks should also fail. Do not be alarmed.";
-   AC_CHECK_FUNC(_oss_ioctl,,[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
+   if test ! "$DRIVER_SUN"; then
+     AC_CHECK_FUNC(_oss_ioctl,,[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
+   fi
    AC_CHECK_FUNC(ALnewconfig,,[AC_CHECK_LIB(audio,ALnewconfig)])
    if test "x$enable_alsa" = "xyes"; then
       AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(sound,snd_cards)])
@@ -382,7 +394,8 @@ if test "x$with_libwrap" = "xyes"; then
 
    wrap_ok=no
    AC_TRY_LINK(
-[#include <tcpd.h>
+[#include <stdio.h>
+#include <tcpd.h>
 #include <syslog.h>
 int allow_severity = LOG_INFO;
 int deny_severity = LOG_WARNING;],
@@ -392,7 +405,8 @@ int deny_severity = LOG_WARNING;],
        wrap_ok=yes],
       [LIBS="$LIBS -lnsl"
        AC_TRY_LINK(
-[#include <tcpd.h>
+[#include <stdio.h>
+#include <tcpd.h>
 #include <syslog.h>
 int allow_severity = LOG_INFO;
 int deny_severity = LOG_WARNING;],
