X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gr_audio_oss.m4;h=c4963cf38752376baebe5a64273f1c234b7174b4;hb=287fc41d5f82ff3236aa270689bd55278e2c841a;hp=0bee883fb13dfcc3f39e95afb65f02a6c9e28bdb;hpb=23a71f0089b7c94b7c61a28dd6c0e5af668df79c;p=debian%2Fgnuradio

diff --git a/config/grc_gr_audio_oss.m4 b/config/grc_gr_audio_oss.m4
index 0bee883f..c4963cf3 100644
--- a/config/grc_gr_audio_oss.m4
+++ b/config/grc_gr_audio_oss.m4
@@ -18,7 +18,7 @@ dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_AUDIO_OSS],[
-    AC_CONFIG_SRCDIR([gr-audio-oss/src/audio_oss.i])
+    GRC_ENABLE([gr-audio-oss])    
 
     AC_CONFIG_FILES([ \
 	gr-audio-oss/Makefile \
@@ -26,27 +26,24 @@ AC_DEFUN([GRC_GR_AUDIO_OSS],[
 	gr-audio-oss/src/run_tests \
     ])
 
-    succeeded=yes
-
+    passed=yes
     case $target in
     	*-*-netbsd*)
-    	    AC_HAVE_LIBRARY(ossaudio,[],[succeeded=no])
-	    if test $succeeded = yes; then
+    	    AC_HAVE_LIBRARY(ossaudio,[],
+	        [passed=no;AC_MSG_RESULT([gr-audio-oss requires library ossaudio, not found.])])
+	    if test x$passed != xno; then
 		OSS_LIBS=-lossaudio
 		AC_MSG_RESULT([Using OSS library $OSS_LIBS])
 	    fi
     	    ;;
     	*)
-    	    AC_CHECK_HEADER(sys/soundcard.h,[],[succeeded=no])
+    	    AC_CHECK_HEADER(sys/soundcard.h,[],
+	        [passed=no;AC_MSG_RESULT([gr-audio-oss requires sys/soundcard.h, not found.])])
     esac
 
-    if test $succeeded = yes; then
+    GRC_BUILD_CONDITIONAL([gr-audio-oss],[
 	AC_SUBST(OSS_LIBS)
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_oss], [chmod +x gr-audio-oss/src/run_tests])
-        subdirs="$subdirs gr-audio-oss"
-    else
-	AC_MSG_RESULT([failed: $OSS_PKG_ERRORS])
-	failed="$failed gr-audio-oss"
-    fi
+    ])
 ])