diff options
Diffstat (limited to 'config/grc_gr_usrp.m4')
| -rw-r--r-- | config/grc_gr_usrp.m4 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config/grc_gr_usrp.m4 b/config/grc_gr_usrp.m4 index c247e5ded..576ef85e4 100644 --- a/config/grc_gr_usrp.m4 +++ b/config/grc_gr_usrp.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,15 +27,15 @@ AC_DEFUN([GRC_GR_USRP],[ ]) passed=yes - # Don't do gr-usrp if usrp 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-usrp requires usrp, which is not being built.]) - passed=no - fi - done + # Don't do gr-usrp if usrp or gnuradio-core skipped + if test x$usrp_skipped = xyes; then + AC_MSG_RESULT([Component gr-usrp 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-usrp requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi GRC_BUILD_CONDITIONAL([gr-usrp],[ dnl run_tests is created from run_tests.in. Make it executable. |