Update revision to release 3.3.0-rc1, update autotools

[debian/gnuradio] / config / grc_gr_cvsd_vocoder.m4

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