diff options
| author | jcorgan | 2008-02-08 23:32:10 +0000 |
|---|---|---|
| committer | jcorgan | 2008-02-08 23:32:10 +0000 |
| commit | 42d9c6f495503d3d9d2db47a9979036c9233f976 (patch) | |
| tree | b4d2be737c3ad6836e62dc35c861e987ea3729e0 /config/grc_gr_utils.m4 | |
| parent | 6bf2c048d94e1c673c06c058b23213cd28292520 (diff) | |
| download | gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.gz gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.bz2 gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.zip | |
Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio modules individually, using already installed dependent libraries and include files. New functionality is enabled using --with-* on configure command line; existing build options should remain unchanged. Nice work by Michael Dickens, still needs documentation update on wiki.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'config/grc_gr_utils.m4')
| -rw-r--r-- | config/grc_gr_utils.m4 | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/config/grc_gr_utils.m4 b/config/grc_gr_utils.m4 index e5b3a6afb..34f56da1e 100644 --- a/config/grc_gr_utils.m4 +++ b/config/grc_gr_utils.m4 @@ -1,4 +1,4 @@ -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -29,22 +29,18 @@ AC_DEFUN([GRC_GR_UTILS],[ passed=yes # Don't do gr-utils if gnuradio-core, usrp, or gr-wxgui 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 = xusrp; then - AC_MSG_RESULT([Component gr-utils requires usrp, which is not being built.]) - passed=no - fi - if test x$dir = xgnuradio-core; then - AC_MSG_RESULT([Component gr-utils requires gnuradio-core, which is not being built.]) - passed=no - fi - if test x$dir = xgr-wxgui; then - AC_MSG_RESULT([Component gr-utils requires gr-wxgui, which is not being built.]) - passed=no - fi - done + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-utils requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + if test x$usrp_skipped = xyes; then + AC_MSG_RESULT([Component gr-utils requires usrp, which is not being built or specified via pre-installed files.]) + passed=no + fi + if test x$gr_wxgui_skipped = xyes; then + AC_MSG_RESULT([Component gr-utils requires gr-wxgui, which is not being built or specified via pre-installed files.]) + passed=no + fi GRC_BUILD_CONDITIONAL([gr-utils]) ]) |