diff options
| author | jcorgan | 2006-08-06 09:05:24 +0000 |
|---|---|---|
| committer | jcorgan | 2006-08-06 09:05:24 +0000 |
| commit | 591ecb7f286484ff157147829c8c9ec69ec2f7fa (patch) | |
| tree | e6974410d718198849b4f23e13aa1412f88ec619 | |
| parent | 63d965c07207c2233943af49ae25a7574f71c3f6 (diff) | |
| download | gnuradio-591ecb7f286484ff157147829c8c9ec69ec2f7fa.tar.gz gnuradio-591ecb7f286484ff157147829c8c9ec69ec2f7fa.tar.bz2 gnuradio-591ecb7f286484ff157147829c8c9ec69ec2f7fa.zip | |
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
| -rw-r--r-- | config/grc_gr_audio_oss.m4 | 17 | ||||
| -rw-r--r-- | gr-audio-oss/src/Makefile.am | 1 |
2 files changed, 14 insertions, 4 deletions
diff --git a/config/grc_gr_audio_oss.m4 b/config/grc_gr_audio_oss.m4 index 17e0ffda3..0bee883fb 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 656d665a7..1a73d8d4c 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 |