$OpenBSD: patch-unix_configure,v 1.2 2011/08/25 12:50:28 naddy Exp $

mostly sndio bits
don't clobber CFLAGS

--- unix/configure.orig	Wed Dec 14 12:29:39 2005
+++ unix/configure	Wed Aug 24 18:00:33 2011
@@ -308,7 +308,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP SHLIB_LD SHLIB_SUFFIX XINCLUDES TCL_INCLUDE_SPEC TCL_LIB_SPEC TK_LIB_SPEC TCL_SRC_DIR TK_SRC_DIR TK_LIBS SNACK_INSTALL_PATH SNACK_HINSTALL_PATH SNACK_LIB_SPEC AINC AFLAG ALIB AOBJ NISTINC NISTLIBS LIBNIST OGGINC OGGLIBS LIBOGG TCLAPI LD_SEARCH_FLAGS TCLVER STUBINITOBJ DOSTUBLIB SNACK_STUB_LIB_FLAG SNACK_VERSION LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP SHLIB_LD SHLIB_SUFFIX XINCLUDES TCL_INCLUDE_SPEC TK_INCLUDE_SPEC TCL_LIB_SPEC TK_LIB_SPEC TCL_SRC_DIR TK_SRC_DIR TK_LIBS SNACK_INSTALL_PATH SNACK_HINSTALL_PATH SNACK_LIB_SPEC AINC AFLAG ALIB AOBJ NISTINC NISTLIBS LIBNIST OGGINC OGGLIBS LIBOGG TCLAPI LD_SEARCH_FLAGS TCLVER STUBINITOBJ DOSTUBLIB SNACK_STUB_LIB_FLAG SNACK_VERSION LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1487,7 +1487,7 @@ if test "$TCL_SHARED_BUILD" = 0; then
 echo "$as_me: error: Tcl and Tk must be configured with the --enable-shared flag" >&2;}
    { (exit 1); exit 1; }; }
 fi
-CFLAGS=$TCL_SHLIB_CFLAGS
+CFLAGS="$CFLAGS $TCL_SHLIB_CFLAGS"
 LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
 SHLIB_LD=$TCL_SHLIB_LD
 SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
@@ -1554,11 +1554,16 @@ case $system in
 	AFLAG="-DOSS"
 	AOBJ="jkAudIO_oss.o"
 	;;
-    NetBSD*|OpenBSD-*)
+    NetBSD*)
 	AFLAG="-DOSS"
 	ALIB="-lossaudio"
 	AOBJ="jkAudIO_oss.o"
         ;;
+    OpenBSD-*)
+	AFLAG="-DSNDIO"
+	ALIB="-lsndio -lossaudio"
+	AOBJ="jkAudIO_sndio.o"
+	;;
     FreeBSD-*)
 	AFLAG="-DOSS"
 	ALIB=""
@@ -3729,6 +3734,7 @@ s,@SHLIB_LD@,$SHLIB_LD,;t t
 s,@SHLIB_SUFFIX@,$SHLIB_SUFFIX,;t t
 s,@XINCLUDES@,$XINCLUDES,;t t
 s,@TCL_INCLUDE_SPEC@,$TCL_INCLUDE_SPEC,;t t
+s,@TK_INCLUDE_SPEC@,$TK_INCLUDE_SPEC,;t t
 s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
 s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
 s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
