From: jcorgan Date: Sun, 6 Aug 2006 09:05:24 +0000 (+0000) Subject: Fixes ticket #12. Merged r3170:HEAD from X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=591ecb7f286484ff157147829c8c9ec69ec2f7fa;p=debian%2Fgnuradio 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 17e0ffda..0bee883f 100644 --- 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 656d665a..1a73d8d4 100644 --- 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