Fixes ticket #12. Merged r3170:HEAD from

branches/developers/jcorgan/ticket-12.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3184 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/config/grc_gr_audio_oss.m4 b/config/grc_gr_audio_oss.m4
index 17e0ffda399dbc87773c2ad7c8a2882891fec984..0bee883fb13dfcc3f39e95afb65f02a6c9e28bdb 100644 (file)
--- a/config/grc_gr_audio_oss.m4
+++ b/config/grc_gr_audio_oss.m4
@@ -28,11 +28,20 @@ AC_DEFUN([GRC_GR_AUDIO_OSS],[
 
     succeeded=yes
 
-    dnl needed for NetBSD
-    dnl FIXME: conditionalize on NetBSD platform
-    dnl AC_HAVE_LIBRARY(ossaudio,[],[succeeded=no])
-    AC_CHECK_HEADER(sys/soundcard.h,[],[succeeded=no])
+    case $target in
+       *-*-netbsd*)
+           AC_HAVE_LIBRARY(ossaudio,[],[succeeded=no])
+           if test $succeeded = yes; then
+               OSS_LIBS=-lossaudio
+               AC_MSG_RESULT([Using OSS library $OSS_LIBS])
+           fi
+           ;;
+       *)
+           AC_CHECK_HEADER(sys/soundcard.h,[],[succeeded=no])
+    esac
+
     if test $succeeded = yes; then
+       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"

diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
index 656d665a774b63189baea9c46de160193cb1d1ca..1a73d8d4c02df7bce115d5131886c82c8737b4d4 100644 (file)
--- a/gr-audio-oss/src/Makefile.am
+++ b/gr-audio-oss/src/Makefile.am
@@ -71,6 +71,7 @@ swiginclude_HEADERS =                         \
 
 _audio_oss_la_LIBADD =                         \
        $(PYTHON_LDFLAGS)               \
+       $(OSS_LIBS)                     \
        -lstdc++                                
 
 _audio_oss_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version