Merge branch 'master' into udp

[debian/gnuradio] / config / grc_gr_radar_mono.m4

diff --git a/config/grc_gr_radar_mono.m4 b/config/grc_gr_radar_mono.m4
index 3d8c4ead8aef5f4339a097bb775fa97a12d950bd..bf8e2dac4b7a906734e5ae1e590c8a37af4a2186 100644 (file)
--- a/config/grc_gr_radar_mono.m4
+++ b/config/grc_gr_radar_mono.m4
@@ -1,10 +1,10 @@
-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 
 dnl GNU Radio is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
+dnl the Free Software Foundation; either version 3, or (at your option)
 dnl any later version.
 dnl 
 dnl GNU Radio is distributed in the hope that it will be useful,
@@ -18,32 +18,27 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street,
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_RADAR_MONO],[
-    GRC_ENABLE([gr-radar-mono])
+    GRC_ENABLE(gr-radar-mono)
+
+    dnl Don't do gr-radar-mono if usrp or gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-radar-mono, usrp)
+    GRC_CHECK_DEPENDENCY(gr-radar-mono, gnuradio-core)
 
     AC_CONFIG_FILES([ \
-        gr-radar-mono/Makefile \
-        gr-radar-mono/doc/Makefile \
-        gr-radar-mono/src/Makefile \
-        gr-radar-mono/src/fpga/Makefile \
-        gr-radar-mono/src/fpga/top/Makefile \
-         gr-radar-mono/src/fpga/lib/Makefile \
-        gr-radar-mono/src/fpga/tb/Makefile \
-        gr-radar-mono/src/lib/Makefile \
-        gr-radar-mono/src/python/Makefile \
-         gr-radar-mono/src/python/run_tests
+        gr-radar-mono/Makefile \
+        gr-radar-mono/doc/Makefile \
+        gr-radar-mono/src/Makefile \
+        gr-radar-mono/src/fpga/Makefile \
+        gr-radar-mono/src/fpga/top/Makefile \
+        gr-radar-mono/src/fpga/lib/Makefile \
+        gr-radar-mono/src/fpga/models/Makefile \
+        gr-radar-mono/src/fpga/tb/Makefile \
+        gr-radar-mono/src/lib/Makefile \
+        gr-radar-mono/src/python/Makefile \
+        gr-radar-mono/src/python/run_tests
     ])
 
-    passed=yes
-    # Don't do gr-radar-mono if usrp skipped
-    for dir in $skipped_dirs
-    do
-       if test x$dir = xusrp; then
-           AC_MSG_RESULT([Component gr-radar-mono requires usrp, which is not being built.])
-           passed=no
-       fi
-    done
-
-    GRC_BUILD_CONDITIONAL([gr-radar-mono],[
+    GRC_BUILD_CONDITIONAL(gr-radar-mono,[
        dnl run_tests is created from run_tests.in.  Make it executable.
        AC_CONFIG_COMMANDS([run_tests_radar_mono], [chmod +x gr-radar-mono/src/python/run_tests])
     ])