Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio...

[debian/gnuradio] / config / grc_gr_usrp.m4

diff --git a/config/grc_gr_usrp.m4 b/config/grc_gr_usrp.m4
index c247e5deda425fffbffb58f48841e85dee980f28..576ef85e437fb4eea82b23410f345742b766da3e 100644 (file)
--- 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.