$NetBSD: patch-ag,v 1.20 2009/12/09 10:13:03 drochner Exp $

--- configure.ac.orig	2009-12-01 02:52:45.000000000 +0100
+++ configure.ac
@@ -109,7 +109,7 @@ dnl ------------------------------------
 AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
 
-test "$host" == "$build" && check_athlon=yes
+test "$host" = "$build" && check_athlon=yes
 
 AC_CONFIG_HEADERS([include/configure.h])
 
@@ -580,6 +580,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
@@ -770,7 +773,7 @@ XXMC_LIBS="${xxmc_path:+-L}$xxmc_path -l
 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"
@@ -800,7 +803,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"
@@ -854,7 +857,7 @@ saved_libs="$LIBS"
 XVMC_LIBS="${xvmc_path:+-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"
@@ -945,7 +948,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
@@ -1457,8 +1459,21 @@ AC_ARG_ENABLE([oss],
 	AS_HELP_STRING([--disable-oss], [Do not build OSS audio output support]))
 
 if test "x$enable_oss" != "xno"; then
+ 
+   case "$host" in
+     *-*-netbsd*|*-*-openbsd*)
+       OSS_LIBS="-lossaudio"
+       ;;
+     *)
+       OSS_LIBS=""
+       ;;
+   esac
+
    AC_CHECK_HEADERS([sys/soundcard.h machine/soundcard.h soundcard.h], [break])
    AC_CHECK_DECL([SNDCTL_DSP_SETFRAGMENT], [have_ossaudio=yes], [], [
+     #ifdef __NetBSD__
+     #include <sys/ioctl.h>
+     #endif
      #ifdef HAVE_SYS_SOUNDCARD_H
      # include <sys/soundcard.h>
      #endif
@@ -1476,6 +1491,7 @@ if test "x$enable_oss" != "xno"; then
 fi
 
 AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes")
+AC_SUBST(OSS_LIBS)
 
 
 dnl ---------------------------------------------
@@ -1607,9 +1623,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
@@ -1944,7 +1961,7 @@ int has_timeout=sizeof(test.timeout);]])
      	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
                       [Define 1 if you have MinGW CD-ROM support])
 	 ;;
-         freebsd4.*|kfreebsd*-gnu)
+         freebsd4.*|kfreebsd*-gnu|dragonfly*)
      	    AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
                       [Define 1 if you have FreeBSD CD-ROM support])
 	 ;;