Merged features/inband -r4812:5218 into trunk. This group of changes

[debian/gnuradio] / config / grc_usrp.m4

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index a7c0cf138ca2e025b7130c02ef4b182d42e2dce5..e0fe60f47018e50aa228aac23bcd8e01ba8e3ad6 100644 (file)
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -30,7 +30,9 @@ AC_DEFUN([GRC_USRP],[
         usrp/host/Makefile \
         usrp/host/misc/Makefile \
         usrp/host/lib/Makefile \
-        usrp/host/lib/std_paths.h \
+        usrp/host/lib/inband/Makefile \
+        usrp/host/lib/legacy/Makefile \
+        usrp/host/lib/legacy/std_paths.h \
         usrp/host/swig/Makefile \
         usrp/host/apps/Makefile \
         usrp/firmware/Makefile \
@@ -54,6 +56,16 @@ AC_DEFUN([GRC_USRP],[
     AC_CHECK_FUNCS([sigaction snprintf])
 
     passed=yes
+    # Don't do usrp if mblock 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 "$dir" = "mblock"; then
+           AC_MSG_RESULT([Component usrp requires mblock, which is not being built.])
+           passed=no
+       fi
+    done
+
     USRP_LIBUSB([],[passed=no;AC_MSG_RESULT([Unable to configure USB dependency.])])
     USRP_SET_FUSB_TECHNIQUE([],[passed=no;AC_MSG_RESULT([Unable to set fast USB technique.])])
     USRP_SDCC([2.4.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler.])])