diff options
| author | Nick Foster | 2011-04-13 17:18:14 -0700 |
|---|---|---|
| committer | Nick Foster | 2011-04-13 17:18:14 -0700 |
| commit | 9b7d444aaebbe0708e9703bce30c63b63bc81825 (patch) | |
| tree | 29121aa250decfb1ed9ca7876e1857eec8779d83 /config/grc_gnuradio_examples.m4 | |
| parent | 258186d5ca2e811ced7ea637fd16e3ed3bb5573e (diff) | |
| parent | e8ff9ef4bb77517428e1208ff4b3551a38107bbd (diff) | |
| download | gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.gz gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.bz2 gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid
Conflicts:
volk/Makefile.common
volk/lib/qa_utils.cc
Diffstat (limited to 'config/grc_gnuradio_examples.m4')
| -rw-r--r-- | config/grc_gnuradio_examples.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4 index 0aad0c0da..203f39d0d 100644 --- a/config/grc_gnuradio_examples.m4 +++ b/config/grc_gnuradio_examples.m4 @@ -20,12 +20,14 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ GRC_ENABLE(gnuradio-examples) - dnl Do not do gnuradio-examples if gnuradio-core skipped + dnl Do not do gnuradio-examples if gnuradio-core or gr-audio skipped GRC_CHECK_DEPENDENCY(gnuradio-examples, gnuradio-core) + GRC_CHECK_DEPENDENCY(gnuradio-examples, gr-audio) 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 \ |