diff options
| author | jcorgan | 2008-02-29 04:00:13 +0000 |
|---|---|---|
| committer | jcorgan | 2008-02-29 04:00:13 +0000 |
| commit | 90e4faa68bbb21a21a459755942756686985ba46 (patch) | |
| tree | a6eec2a8e877a0d9aa5000a1dfb069cc772c8312 /config/grc_gr_sounder.m4 | |
| parent | c7da4a90c594001596ab869cfa4bfb2479c9ac6d (diff) | |
| download | gnuradio-90e4faa68bbb21a21a459755942756686985ba46.tar.gz gnuradio-90e4faa68bbb21a21a459755942756686985ba46.tar.bz2 gnuradio-90e4faa68bbb21a21a459755942756686985ba46.zip | |
Merged r7769:7873 from michaelld/bc_behavior into trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7888 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'config/grc_gr_sounder.m4')
| -rw-r--r-- | config/grc_gr_sounder.m4 | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/config/grc_gr_sounder.m4 b/config/grc_gr_sounder.m4 index 0553bb277..672d13ab1 100644 --- a/config/grc_gr_sounder.m4 +++ b/config/grc_gr_sounder.m4 @@ -18,33 +18,26 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street, dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GR_SOUNDER],[ - GRC_ENABLE([gr-sounder]) + GRC_ENABLE(gr-sounder) + + dnl Don't do gr-sounder if usrp or gnuradio-core skipped + GRC_CHECK_DEPENDENCY(gr-sounder, usrp) + GRC_CHECK_DEPENDENCY(gr-sounder, gnuradio-core) AC_CONFIG_FILES([ \ - gr-sounder/Makefile \ - gr-sounder/doc/Makefile \ - gr-sounder/src/Makefile \ - gr-sounder/src/fpga/Makefile \ - gr-sounder/src/fpga/top/Makefile \ - gr-sounder/src/fpga/lib/Makefile \ - gr-sounder/src/fpga/tb/Makefile \ - gr-sounder/src/lib/Makefile \ - gr-sounder/src/python/Makefile \ - gr-sounder/src/python/run_tests + gr-sounder/Makefile \ + gr-sounder/doc/Makefile \ + gr-sounder/src/Makefile \ + gr-sounder/src/fpga/Makefile \ + gr-sounder/src/fpga/top/Makefile \ + gr-sounder/src/fpga/lib/Makefile \ + gr-sounder/src/fpga/tb/Makefile \ + gr-sounder/src/lib/Makefile \ + gr-sounder/src/python/Makefile \ + gr-sounder/src/python/run_tests ]) - passed=yes - # Don't do gr-sounder if usrp or gnuradio-core skipped - if test x$usrp_skipped = xyes; then - AC_MSG_RESULT([Component gr-sounder requires usrp, which is not being built or specified via pre-installed files.]) - passed=no - fi - if test x$gnuradio_core_skipped = xyes; then - AC_MSG_RESULT([Component gr-sounder requires gnuradio-core, which is not being built or specified via pre-installed files.]) - passed=no - fi - - GRC_BUILD_CONDITIONAL([gr-sounder],[ + GRC_BUILD_CONDITIONAL(gr-sounder,[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_sounder], [chmod +x gr-sounder/src/python/run_tests]) ]) |