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

[debian/gnuradio] / config / grc_gr_sounder.m4

diff --git a/config/grc_gr_sounder.m4 b/config/grc_gr_sounder.m4
index f716a324c79a21e75f435f7f451231a79029da88..0553bb27708b35a8faa4c8abfe1e10559d7f453e 100644 (file)
--- a/config/grc_gr_sounder.m4
+++ b/config/grc_gr_sounder.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2007 Free Software Foundation, Inc.
+dnl Copyright 2007,2008 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -34,14 +34,15 @@ AC_DEFUN([GRC_GR_SOUNDER],[
     ])
 
     passed=yes
-    # Don't do gr-sounder if usrp skipped
-    for dir in $skipped_dirs
-    do
-       if test x$dir = xusrp; then
-           AC_MSG_RESULT([Component gr-sounder requires usrp, which is not being built.])
-           passed=no
-       fi
-    done
+    # Don't do gr-sounder if usrp or gnuradio-core skipped
+    if test x$usrp_skipped = xyes; then
+        AC_MSG_RESULT([Component gr-sounder 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-sounder requires gnuradio-core, which is not being built or specified via pre-installed files.])
+       passed=no
+    fi
 
     GRC_BUILD_CONDITIONAL([gr-sounder],[
        dnl run_tests is created from run_tests.in.  Make it executable.