$NetBSD: patch-ag,v 1.13.2.1 2006/12/09 09:13:15 salo Exp $

--- configure.ac.orig	2006-11-05 15:16:56.000000000 +0000
+++ configure.ac
@@ -221,7 +221,7 @@ AC_ARG_WITH(pthread-prefix, 
   [pthread_prefix="no"])
 
 case "$host" in
-  *-*-freebsd*)
+  *-*-freebsd* | *-*-dragonfly*)
     if test x"$pthread_prefix" = "xno"; then
       pthread_prefix="/usr/local"
     fi
@@ -508,6 +508,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
 AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
 AC_SUBST(NET_LIBS)
 
+WINE_LIBS=""
+AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",)
+AC_SUBST(WINE_LIBS)
 
 dnl ---------------------------------------------
 dnl socklen_t
@@ -698,7 +701,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
 AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions)
 AC_MSG_RESULT()
 dnl Check if vld "extended" XvMC is available
-if test x$xxmc_stub == "xXvMCW" && test x$ac_have_xv == "xyes"; then
+if test x$xxmc_stub = "xXvMCW" && test x$ac_have_xv = "xyes"; then
 	AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
              	     ac_have_xxmc="yes",
 	             [ac_have_xxmc="no"
@@ -728,7 +731,7 @@ if test x$ac_have_xxmc = "xyes"; then
 fi
 dnl Try fallback to standard XvMC if vld failed
 if test x$ac_have_xxmc = "xno"; then
-  if test x$xxmc_stub == "xXvMCW"; then
+  if test x$xxmc_stub = "xXvMCW"; then
 	  AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
                ac_have_xxmc="yes",
 	       [ac_have_xxmc="no"
@@ -782,7 +785,7 @@ saved_libs="$LIBS"
 XVMC_LIBS="-L$xvmc_path -l$xvmc_stub"
 AC_MSG_CHECKING(whether to enable the xvmc plugin)
 AC_MSG_RESULT()
-if test x$xvmc_stub == "xXvMCW"; then
+if test x$xvmc_stub = "xXvMCW"; then
 	AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
              ac_have_xvmc="yes",
 	     [ac_have_xvmc="no"
@@ -833,7 +836,6 @@ if test "x$enable_xinerama" != "xno"; th
    ])
    if test "x$ac_have_xinerama" = "xyes"; then
       AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
-      X_LIBS="${X_LIBS} ${XINERAMA_LIBS}"
    fi
 else
   ac_have_xinerama=no
@@ -1325,10 +1327,21 @@ AC_ARG_ENABLE([oss],
   [with_oss=$enableval], [with_oss=yes])
 
 if test "x$with_oss" = "xyes"; then
+
+  case "$host" in
+    *-*-netbsd*|*-*-openbsd*)
+      OSS_LIBS="-lossaudio"
+      ;;
+    *)
+      OSS_LIBS=""
+      ;;
+  esac
+
   AC_MSG_CHECKING(for OSS audio support)
   have_ossaudio=no
   AC_TRY_COMPILE([
 	    #ifdef __NetBSD__
+	    #include <sys/ioctl.h>
 	    #include <soundcard.h>
 	    #else
 	    #include <sys/soundcard.h>
@@ -1343,7 +1356,7 @@ else
   have_ossaudio=no
 fi
 AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
-
+AC_SUBST(OSS_LIBS)
 
 dnl ---------------------------------------------
 dnl Alsa support
@@ -1468,9 +1481,10 @@ AC_ARG_ENABLE([gnomevfs],
   [with_gnome_vfs=$enableval], [with_gnome_vfs=yes])
 
 if test "x$with_gnome_vfs" = "xyes"; then
-  PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
-                no_gnome_vfs=no,
-		no_gnome_vfs=yes)
+  dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
+  dnl               no_gnome_vfs=no,
+  dnl 		no_gnome_vfs=yes)
+  no_gnome_vfs=yes
   AC_SUBST(GNOME_VFS_CFLAGS)
   AC_SUBST(GNOME_VFS_LIBS)
   if test x"$no_gnome_vfs" != "xyes"; then
@@ -1816,7 +1830,7 @@ int has_timeout=sizeof(test.timeout);],
      	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
                       [Define 1 if you have MinGW CD-ROM support])
 	 ;;
-         freebsd4.*)
+         freebsd4.* | dragonfly*)
      	    AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
                       [Define 1 if you have FreeBSD CD-ROM support])
 	 ;;
