summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/grc_gnuradio_examples.m45
-rw-r--r--config/grc_gr_audio.m43
-rw-r--r--config/grc_gr_comedi.m42
-rw-r--r--config/grc_gr_usrp2.m41
4 files changed, 6 insertions, 5 deletions
diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4
index 203f39d0d..6dff01943 100644
--- a/config/grc_gnuradio_examples.m4
+++ b/config/grc_gnuradio_examples.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009,2011 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -26,14 +26,11 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
AC_CONFIG_FILES([ \
gnuradio-examples/Makefile \
- gnuradio-examples/c++/Makefile \
- gnuradio-examples/c++/audio/Makefile \
gnuradio-examples/python/Makefile \
gnuradio-examples/grc/Makefile \
gnuradio-examples/python/apps/hf_explorer/Makefile \
gnuradio-examples/python/apps/hf_radio/Makefile \
gnuradio-examples/python/apps/Makefile \
- gnuradio-examples/python/audio/Makefile \
gnuradio-examples/python/digital/Makefile \
gnuradio-examples/python/digital_voice/Makefile \
gnuradio-examples/python/digital-bert/Makefile \
diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4
index bcb19be35..92a0440d0 100644
--- a/config/grc_gr_audio.m4
+++ b/config/grc_gr_audio.m4
@@ -101,6 +101,9 @@ AC_DEFUN([GRC_GR_AUDIO],[
AC_CONFIG_FILES([ \
gr-audio/Makefile \
+ gr-audio/examples/Makefile \
+ gr-audio/examples/c++/Makefile \
+ gr-audio/examples/python/Makefile \
gr-audio/grc/Makefile \
gr-audio/include/Makefile \
gr-audio/lib/Makefile \
diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4
index 5e3089417..7e54b0f5a 100644
--- a/config/grc_gr_comedi.m4
+++ b/config/grc_gr_comedi.m4
@@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_COMEDI],[
dnl no : otherwise
if test $passed = yes; then
dnl Don't do gr-comedi if the 'comedi' library is unavailable.
- PKG_CHECK_MODULES(COMEDI, comedilib < 0.8,[],
+ PKG_CHECK_MODULES(COMEDI, comedilib >= 0.8,[],
[passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])])
fi
diff --git a/config/grc_gr_usrp2.m4 b/config/grc_gr_usrp2.m4
index 3d64db6d6..4ee29861b 100644
--- a/config/grc_gr_usrp2.m4
+++ b/config/grc_gr_usrp2.m4
@@ -26,6 +26,7 @@ AC_DEFUN([GRC_GR_USRP2],[
AC_CONFIG_FILES([ \
gr-usrp2/Makefile \
+ gr-usrp2/apps/Makefile \
gr-usrp2/grc/Makefile \
gr-usrp2/gnuradio-usrp2.pc \
gr-usrp2/src/Makefile \