Merge branch 'wip/gcell-no-omni'

[debian/gnuradio] / config / grc_gr_atsc.m4

diff --git a/config/grc_gr_atsc.m4 b/config/grc_gr_atsc.m4
index a0b394eade98793445c9a3364c9214329fd76a2f..6dfb40132e549a6cdb0f3d4681eaf4b559caeab0 100644 (file)
--- a/config/grc_gr_atsc.m4
+++ b/config/grc_gr_atsc.m4
@@ -18,25 +18,22 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street,
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_ATSC],[
-    GRC_ENABLE([gr-atsc])
+    GRC_ENABLE(gr-atsc)
+
+    dnl Don't do gr-atsc if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-atsc, gnuradio-core)
 
     AC_CONFIG_FILES([\
-       gr-atsc/Makefile \
-       gr-atsc/doc/Makefile \
-       gr-atsc/src/Makefile \
-       gr-atsc/src/lib/Makefile \
-       gr-atsc/src/python/Makefile \
-       gr-atsc/src/python/run_tests \
+        gr-atsc/Makefile \
+       gr-atsc/gnuradio-atsc.pc \
+        gr-atsc/doc/Makefile \
+        gr-atsc/src/Makefile \
+        gr-atsc/src/lib/Makefile \
+        gr-atsc/src/python/Makefile \
+        gr-atsc/src/python/run_tests \
     ])
 
-    passed=yes
-    # Don't do gr-atsc if gnuradio-core skipped
-    if test x$gnuradio_core_skipped = xyes; then
-        AC_MSG_RESULT([Component gr-atsc requires gnuradio-core, which is not being built or specified via pre-installed files.])
-       passed=no
-    fi
-
-    GRC_BUILD_CONDITIONAL([gr-atsc],[
+    GRC_BUILD_CONDITIONAL(gr-atsc,[
         dnl run_tests is created from run_tests.in.  Make it executable.
        AC_CONFIG_COMMANDS([run_tests_atsc], [chmod +x gr-atsc/src/python/run_tests])
     ])