# HG changeset patch
# User js
# Date 1158458303 25200
# Node ID 77fd86d4382f3aba471b035ac519b4c985f7a922
# Parent  aa856238e97d475ebc6808a59b972a6414cfc8df
[svn] nenolod's fix for the soundcard.h check was incomplete, fixed

diff -r aa856238e97d -r 77fd86d4382f ChangeLog
--- a/ChangeLog	Sat Sep 16 18:56:17 2006 -0700
+++ b/ChangeLog	Sat Sep 16 18:58:23 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-17 01:56:17 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2383]
+  - check for soundcard.h
+  
+
+  Changes:        Modified:
+  +1 -0           trunk/configure.ac  
+
+
 2006-09-17 01:46:42 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2381]
   - oh oops
diff -r aa856238e97d -r 77fd86d4382f configure.ac
--- a/configure.ac	Sat Sep 16 18:56:17 2006 -0700
+++ b/configure.ac	Sat Sep 16 18:58:23 2006 -0700
@@ -636,7 +636,7 @@
         for i in `cat /etc/oss.conf`; do
             t=`echo $i | sed -e 's/OSSLIBDIR=//'`
             if test "$i" != "$t" ; then
-                if test -f "$t/include/sys/soundcard.h" ; then
+                if test -f "$t/include/sys/soundcard.h" -o -f "$i/include/soundcard.h" ; then
                     OSS_CFLAGS="-I$t/include"
                 fi
             fi
@@ -654,7 +654,7 @@
     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" || test "${ac_cv_header_soundcard_h}" = "yes"; then
+    if test "${ac_cv_header_soundcard_h}" = "yes" || "${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