$OpenBSD: patch-configure_in,v 1.3 2008/01/22 20:31:11 steven Exp $
--- configure.in.orig	Wed Nov 21 13:41:55 2007
+++ configure.in	Sun Jan  6 01:03:30 2008
@@ -4065,7 +4065,7 @@ if test "$TOOLKIT" != "MSW" ; then
 
         AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
         if test "x$found_sql_h" = "x1" ; then
-            AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
+            AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK="-pthread -liodbc",
             [
                 AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
                 [
@@ -4387,7 +4387,7 @@ UNICODE=0
 lib_unicode_suffix=
 WX_CHARTYPE="ansi"
 if test "$wxUSE_UNICODE" = "yes"; then
-    lib_unicode_suffix=u
+    lib_unicode_suffix=
     WX_CHARTYPE="unicode"
     UNICODE=1
 fi
@@ -4396,8 +4396,8 @@ lib_debug_suffix=
 WX_DEBUGTYPE="release"
 DEBUG_FLAG=0
 if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-    lib_debug_suffix=d
-    WX_DEBUGTYPE="debug"
+    lib_debug_suffix=
+    WX_DEBUGTYPE="release"
     DEBUG_FLAG=1
 fi
 
@@ -4411,7 +4411,7 @@ fi
 
 WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr a-z A-Z`
 
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
 
 TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
 
@@ -4637,14 +4637,6 @@ if test "$wxUSE_WCHAR_T" = "yes"; then
     if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
         CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
     fi
-
-    dnl Try to use wcsrtombs instead of wcstombs which is buggy in old GNU
-    dnl libc versions if possible. AC_CHECK_FUNCS only checks it's in the
-    dnl library, not the header, so do a header check for mbstate_t first.
-    AC_CHECK_TYPES([mbstate_t],
-                   [AC_CHECK_FUNCS(wcsrtombs)],
-                   [],
-                   [#include <wchar.h>])
 else
     AC_MSG_WARN([Wide character support is unavailable])
 fi
@@ -6020,8 +6012,37 @@ if test "$USE_UNIX" = "1" ; then
         ])
     fi
 
+    AC_CACHE_CHECK([for ioctl() in soundcard.h], ac_cv_header_soundcard, [
+        AC_TRY_LINK([
+                #include <soundcard.h>
+            ],
+            [
+                ioctl(0, SNDCTL_DSP_SYNC, 0);
+            ],
+            ac_cv_header_soundcard=yes,
+            [
+                saveLibs="$LIBS"
+                LIBS="$saveLibs -lossaudio"
+                AC_TRY_LINK([
+                        #include <soundcard.h>
+                    ],
+                    [
+                        ioctl(0, SNDCTL_DSP_SYNC, 0);
+                    ],
+                    ac_cv_header_soundcard=yes,
+                    [
+                        LIBS="$saveLibs"
+                        ac_cv_header_soundcard=no
+                    ]
+                )
+            ]
+        )
+    ])
+
     if test "$ac_cv_header_sys_soundcard" = "yes"; then
         AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
+    elif test "$ac_cv_header_soundcard" = "yes"; then
+        AC_DEFINE(HAVE_SOUNDCARD_H)
     else
         DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
     fi