$OpenBSD: patch-configure_ac,v 1.4 2014/02/07 22:20:13 dcoppa Exp $
--- configure.ac.orig	Sun Feb  2 20:49:04 2014
+++ configure.ac	Fri Feb  7 09:09:55 2014
@@ -126,6 +126,7 @@ AC_ARG_ENABLE(alac, [AS_HELP_STRING([--enable-alac    
 AC_ARG_ENABLE(wma, [AS_HELP_STRING([--enable-wma      ], [build WMA plugin (default: auto)])], [enable_wma=$enableval], [enable_wma=yes])
 AC_ARG_ENABLE(pltbrowser, [AS_HELP_STRING([--enable-pltbrowser      ], [build playlist browser gui plugin (default: auto)])], [enable_pltbrowser=$enableval], [enable_pltbrowser=yes])
 AC_ARG_ENABLE(abstract_socket, [AS_HELP_STRING([--enable-abstract-socket      ], [use abstract UNIX socket for IPC (default: disabled)])], [enable_abstract_socket=$enableval], [enable_abstract_socket=no])
+AC_ARG_ENABLE(sndio, [AS_HELP_STRING([--enable-sndio      ], [enable sndio output plugin (default: enabled)])], [enable_sndio=$enableval], [enable_sndio=yes])
 
 AS_IF([test "${enable_staticlink}" != "no"], [
     AC_DEFINE_UNQUOTED([STATICLINK], [1], [Define if building static version])
@@ -182,8 +183,8 @@ AS_IF([test "${enable_portable}" != "no" -a "${enable_
     PREFIXFLAGS=" -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\""
 ])
 
-CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
-CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
+CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $PREFIXFLAGS"
+CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $PREFIXFLAGS"
 
 AS_IF([test "${enable_staticlink}" != "no"], [
     HAVE_ZLIB=yes
@@ -324,11 +325,11 @@ AS_IF([test "${enable_vorbis}" != "no"], [
         VORBIS_LIBS="../../$LIB/lib/libogg.a ../../$LIB/lib/libvorbis.a ../../$LIB/lib/libvorbisenc.a ../../$LIB/lib/libvorbisfile.a"
         AC_SUBST(VORBIS_LIBS)
     ], [
-        AC_CHECK_LIB([vorbis], [main], [HAVE_VORBIS=yes])
-        AC_CHECK_LIB([vorbisfile], [main], [HAVE_VORBISFILE=yes])
+        AC_CHECK_LIB([vorbis], [main], [HAVE_VORBIS=yes], [], [-logg -lm])
+        AC_CHECK_LIB([vorbisfile], [main], [HAVE_VORBISFILE=yes], [], [-lvorbis -logg -lm])
         AS_IF([test "$HAVE_VORBIS" = "yes" -a "${HAVE_VORBISFILE}" = "yes"], [
             HAVE_VORBISPLUGIN=yes
-            VORBIS_LIBS="-lvorbis -lvorbisfile"
+            VORBIS_LIBS="-lvorbis -lvorbisfile -logg -lm"
             AC_SUBST(VORBIS_LIBS)
         ])
     ])
@@ -341,10 +342,10 @@ AS_IF([test "${enable_flac}" != "no"], [
         FLAC_LIBS="../../$LIB/lib/libFLAC.a ../../$LIB/lib/libogg.a"
         AC_SUBST(FLAC_LIBS)
     ], [
-        AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes])
+        AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes], [], [-logg -lm])
         AS_IF([test "${HAVE_FLAC}" = "yes"], [
             HAVE_FLACPLUGIN=yes
-            FLAC_LIBS="-lFLAC"
+            FLAC_LIBS="-lFLAC -logg -lm"
             AC_SUBST(FLAC_LIBS)
         ])
     ])
@@ -671,8 +672,12 @@ AS_IF([test "${enable_pltbrowser}" != "no"], [
     HAVE_PLTBROWSER=yes
 ])
 
-PLUGINS_DIRS="plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
+AS_IF([test "${enable_sndio}" != "no"], [
+    HAVE_SNDIO=yes
+])
 
+PLUGINS_DIRS="plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sndio"
+
 AM_CONDITIONAL(APE_USE_YASM, test "x$APE_USE_YASM" = "xyes")
 AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
@@ -729,6 +734,7 @@ AM_CONDITIONAL(STATICLINK, test "x$STATICLINK" = "xyes
 AM_CONDITIONAL(PORTABLE, test "x$PORTABLE" = "xyes")
 AM_CONDITIONAL(PORTABLE_FULL, test "x$PORTABLE_FULL" = "xyes")
 AM_CONDITIONAL(USE_ABSTRACT_SOCKET_NAME, test "x$USE_ABSTRACT_SOCKET_NAME" = "xyes")
+AM_CONDITIONAL(HAVE_SNDIO, test "x$HAVE_SNDIO" = "xyes")
 
 AC_SUBST(PLUGINS_DIRS)
 
@@ -800,6 +806,7 @@ PRINT_PLUGIN_INFO([mono2stereo],[mono2stereo DSP plugi
 PRINT_PLUGIN_INFO([alac],[ALAC plugin],[test "x$HAVE_ALAC" = "xyes"])
 PRINT_PLUGIN_INFO([wma],[WMA plugin],[test "x$HAVE_WMA" = "xyes"])
 PRINT_PLUGIN_INFO([pltbrowser],[playlist browser gui plugin],[test "x$HAVE_PLTBROWSER" = "xyes"])
+PRINT_PLUGIN_INFO([sndio],[sndio output plugin],[test "x$HAVE_SNDIO" = "xyes"])
 
 echo
 
@@ -807,7 +814,6 @@ AC_CONFIG_FILES([
 Makefile
 pixmaps/Makefile
 icons/Makefile
-plugins/libmp4ff/Makefile
 plugins/libparser/Makefile
 plugins/gme/Makefile
 plugins/alsa/Makefile
@@ -852,6 +858,7 @@ plugins/alac/Makefile
 plugins/wma/Makefile
 plugins/pltbrowser/Makefile
 plugins/coreaudio/Makefile
+plugins/sndio/Makefile
 intl/Makefile
 po/Makefile.in
 deadbeef.desktop
