diff options
| author | jcorgan | 2006-08-25 23:58:20 +0000 |
|---|---|---|
| committer | jcorgan | 2006-08-25 23:58:20 +0000 |
| commit | 287fc41d5f82ff3236aa270689bd55278e2c841a (patch) | |
| tree | 2b8fab047b42032276ffc9bac58bf1f01a7a7772 /config/grc_mblock.m4 | |
| parent | 23a71f0089b7c94b7c61a28dd6c0e5af668df79c (diff) | |
| download | gnuradio-287fc41d5f82ff3236aa270689bd55278e2c841a.tar.gz gnuradio-287fc41d5f82ff3236aa270689bd55278e2c841a.tar.bz2 gnuradio-287fc41d5f82ff3236aa270689bd55278e2c841a.zip | |
Implements ticket:28. See BuildConfiguration for documentation.
Merged developer branch jcorgan/ticket-28 into trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3417 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'config/grc_mblock.m4')
| -rw-r--r-- | config/grc_mblock.m4 | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/config/grc_mblock.m4 b/config/grc_mblock.m4 index b98fb790a..a46875ea7 100644 --- a/config/grc_mblock.m4 +++ b/config/grc_mblock.m4 @@ -18,7 +18,7 @@ dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, dnl Boston, MA 02111-1307, USA. AC_DEFUN([GRC_MBLOCK],[ - AC_CONFIG_SRCDIR([mblock/src/lib/mb_mblock.h]) + GRC_ENABLE([mblock]) AC_CONFIG_FILES([\ mblock/Makefile \ @@ -27,8 +27,19 @@ AC_DEFUN([GRC_MBLOCK],[ mblock/src/lib/Makefile ]) - dnl run_tests is created from run_tests.in. Make it executable. - dnl AC_CONFIG_COMMANDS([run_tests_mblock], [chmod +x mblock/src/python/run_tests]) + passed=yes + # Don't do mblock if pmt skipped + # There *has* to be a better way to check if a value is in a string + for dir in $skipped_dirs + do + if test x$dir = xpmt; then + AC_MSG_RESULT([Component mblock requires pmt, which is not being built.]) + passed=no + fi + done - subdirs="$subdirs mblock" + GRC_BUILD_CONDITIONAL([mblock],[ + dnl run_tests is created from run_tests.in. Make it executable. + dnl AC_CONFIG_COMMANDS([run_tests_mblock], [chmod +x mblock/src/python/run_tests]) + ]) ]) |