# HG changeset patch
# User nenolod
# Date 1158370017 25200
# Node ID ffa7b9168190efadecff58a2c3d7084e923233e4
# Parent  365a2b043447dead228fa4139d1d9ecd6469ecbc
[svn] - do not build OSS plugin unless we really can

diff -r 365a2b043447 -r ffa7b9168190 ChangeLog
--- a/ChangeLog	Fri Sep 15 18:24:27 2006 -0700
+++ b/ChangeLog	Fri Sep 15 18:26:57 2006 -0700
@@ -1,3 +1,13 @@
+2006-09-16 01:24:27 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2345]
+  - remove debugging printf()'s
+  
+
+  Changes:        Modified:
+  +1 -18          trunk/Plugins/Output/CoreAudio/configure.c  
+  +0 -27          trunk/Plugins/Output/CoreAudio/convert.c  
+
+
 2006-09-15 23:48:51 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2343]
   - only build cdaudio plugin if we support DAE
diff -r 365a2b043447 -r ffa7b9168190 configure.ac
--- a/configure.ac	Fri Sep 15 18:24:27 2006 -0700
+++ b/configure.ac	Fri Sep 15 18:26:57 2006 -0700
@@ -624,11 +624,12 @@
 
 AC_ARG_ENABLE(oss,
     [  --disable-oss           disable the OSS output plugin (default=enabled)],
-    [have_oss=$enableval],
-    [have_oss=yes]
+    [enable_oss=$enableval],
+    [enable_oss=yes]
 )
 
-if test "$have_oss" = "yes"; then
+have_oss=no
+if test "$enable_oss" = "yes"; then
     AC_MSG_CHECKING(for OSS include dir)
     OSS_CFLAGS=""
     if test -f "/etc/oss.conf" ; then
@@ -652,25 +653,25 @@
     AC_CHECK_HEADERS(machine/soundcard.h)
     CFLAGS=$CFLAGS_save
 
-    if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" = "yes"; then
+    if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" = "yes" || test "${ac_cv_header_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)
-    ])
+	AC_MSG_CHECKING(whether 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
 fi
 
 if test "$have_oss" = "yes"; then