# HG changeset patch
# User js
# Date 1158332500 25200
# Node ID e4d9d2657d9a63d3e751002fdd4aecfbb5369c74
# Parent  cd8711f34c885a46792f620014c735636ff0b400
[svn] This adds -lossaudio to the OSS and esd plugin on platforms having that libs. With this, Audacious finally build & runs perfectly on OpenBSD.

diff -r cd8711f34c88 -r e4d9d2657d9a ChangeLog
--- a/ChangeLog	Fri Sep 15 07:46:49 2006 -0700
+++ b/ChangeLog	Fri Sep 15 08:01:40 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-15 14:46:49 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2329]
+  - DND fixes
+  
+
+  Changes:        Modified:
+  +2 -2           trunk/audacious/mainwin.c  
+
+
 2006-09-15 13:36:26 +0000  Jonathan Schleifer <js@h3c.de>
   revision [2327]
   - Removed .cpp.o target since we don't have any .cpp files anymore.
diff -r cd8711f34c88 -r e4d9d2657d9a Plugins/Output/OSS/Makefile.in
--- a/Plugins/Output/OSS/Makefile.in	Fri Sep 15 07:46:49 2006 -0700
+++ b/Plugins/Output/OSS/Makefile.in	Fri Sep 15 08:01:40 2006 -0700
@@ -7,7 +7,7 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(OSS_LIBS) $(GTK_LIBS)
 SOURCES = OSS.c mixer.c about.c configure.c audio.c init.c convert.c
 
 OBJECTS = ${SOURCES:.c=.o}
diff -r cd8711f34c88 -r e4d9d2657d9a Plugins/Output/esd/Makefile.in
--- a/Plugins/Output/esd/Makefile.in	Fri Sep 15 07:46:49 2006 -0700
+++ b/Plugins/Output/esd/Makefile.in	Fri Sep 15 08:01:40 2006 -0700
@@ -7,7 +7,7 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(ESD_LIBS)
+LIBADD = $(GTK_LIBS) $(ESD_LIBS) $(OSS_LIBS)
 SOURCES = esd.c mixer.c about.c configure.c audio.c init.c
 
 OBJECTS = ${SOURCES:.c=.o}
diff -r cd8711f34c88 -r e4d9d2657d9a configure.ac
--- a/configure.ac	Fri Sep 15 07:46:49 2006 -0700
+++ b/configure.ac	Fri Sep 15 08:01:40 2006 -0700
@@ -637,6 +637,22 @@
     if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" = "yes"; then
         have_oss=yes
     fi
+
+    AC_MSG_CHECKING(wether we need -lossaudio)
+    AC_TRY_LINK([
+	#include <sys/ioctl.h>
+	#ifdef HAVE_SYS_SOUNDCARD_H
+	#include <sys/soundcard.h>
+	#else
+	#include <soundcard.h>
+	#endif
+    ], [
+	int fd, value;
+	ioctl(fd, SOUND_MIXER_READ_VOLUME, &value);
+    ], AC_MSG_RESULT(no), [
+	OSS_LIBS="-lossaudio"
+	AC_MSG_RESULT(yes)
+    ])
 fi
 
 if test "$have_oss" = "yes"; then
@@ -649,6 +665,8 @@
 	OUTPUT_PLUGINS="$OUTPUT_PLUGINS OSS"
 fi
 
+AC_SUBST(OSS_LIBS)
+
 dnl *** ALSA output plugin
 
 AC_ARG_ENABLE(alsa,
diff -r cd8711f34c88 -r e4d9d2657d9a mk/rules.mk.in
--- a/mk/rules.mk.in	Fri Sep 15 07:46:49 2006 -0700
+++ b/mk/rules.mk.in	Fri Sep 15 08:01:40 2006 -0700
@@ -221,6 +221,7 @@
 OBJEXT ?= @OBJEXT@
 OGG_VORBIS_CFLAGS ?= @OGG_VORBIS_CFLAGS@
 OGG_VORBIS_LIBS ?= @OGG_VORBIS_LIBS@
+OSS_LIBS ?= @OSS_LIBS@
 OUTPUT_PLUGINS ?= @OUTPUT_PLUGINS@
 OUTPUT_PLUGIN_DIR ?= @OUTPUT_PLUGIN_DIR@
 PACKAGE ?= @PACKAGE@