Merge branch 'master' into notify

Conflicts:
	configure.ac

1 files changed, 51 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 80ff9970..94e6f780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,11 +35,11 @@ esac
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 
-INSANE_CFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits -Wbad-function-cast"
-INSANE_CXXFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits"
+dnl INSANE_CFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits -Wbad-function-cast"
+dnl INSANE_CXXFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits"
 
 CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\""
-CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\""
+CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\" -std=c99"
 
 PKG_CHECK_MODULES(DEPS, samplerate)
 PKG_CHECK_MODULES(GTKUI_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK=1, NO_GTK=1)
@@ -176,6 +176,52 @@ if test ${HAVE_FFMPEG}; then
     AC_SUBST(FFMPEG_DIR)
 fi
 
+dnl *** OSS output (partly stolen from audacious)
+have_oss=no
+
+AC_MSG_CHECKING(for OSS include dir)
+OSS_CFLAGS=""
+if test -f "/etc/oss.conf" ; then
+    for i in `cat /etc/oss.conf`; do
+        t=`echo $i | sed -e 's/OSSLIBDIR=//'`
+        if test "x$i" != "x$t" ; then
+            if test -f "$t/include/sys/soundcard.h" -o -f "$i/include/soundcard.h" ; then
+                OSS_CFLAGS="-I$t/include/sys"
+                AC_MSG_RESULT([$OSS_CFLAGS])
+                have_oss=yes
+            fi
+        fi
+    done
+else
+    AC_MSG_RESULT([not found])
+fi
+
+if test "x$have_oss" != "xyes"; then
+    AC_MSG_CHECKING(for sys/soundcard.h)
+    AC_CHECK_HEADERS(sys/soundcard.h)
+    if test "x${ac_cv_header_sys_soundcard_h}" = "xyes" ; then
+        have_oss=yes
+        AC_MSG_RESULT([found])
+    else
+        AC_MSG_RESULT([not found])
+    fi
+fi
+
+
+if test "x$have_oss" = "xyes"; then
+    OSS_DIR="plugins/oss"
+    AC_SUBST(OSS_CFLAGS)
+    AC_SUBST(OSS_DIR)
+fi
+
+dnl echo
+dnl echo "have_oss=$have_oss"
+dnl echo "OSS_CFLAGS=$OSS_CFLAGS"
+dnl echo "OSS_LIBS=$OSS_LIBS"
+dnl echo "OSS_DIR=$OSS_DIR"
+dnl echo
+
+
 dnl print summary
 echo
 echo "plugin summary:"
@@ -212,6 +258,7 @@ PRINT_PLUGIN_INFO([cdda],[cd audio player],[test $HAVE_CDIO && test $HAVE_CDDB])
 PRINT_PLUGIN_INFO([gtkui],[GTK user interface],[test $HAVE_GTK])
 PRINT_PLUGIN_INFO([ffmpeg],[ffmpeg codecs],[test $HAVE_FFMPEG])
 PRINT_PLUGIN_INFO([notification],[Current track notification],[true])
+PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$have_oss" = "xyes"])
 echo
 
 AC_OUTPUT([
@@ -239,6 +286,7 @@ plugins/vtx/Makefile
 plugins/adplug/Makefile
 plugins/ffmpeg/Makefile
 plugins/notification/Makefile
+plugins/oss/Makefile
 deadbeef.desktop
 ])