From 42d9c6f495503d3d9d2db47a9979036c9233f976 Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Fri, 8 Feb 2008 23:32:10 +0000
Subject: Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to
compile GNU Radio modules individually, using already installed dependent
libraries and include files. New functionality is enabled using --with-* on
configure command line; existing build options should remain unchanged. Nice
work by Michael Dickens, still needs documentation update on wiki.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5
---
config/grc_gr_trellis.m4 | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'config/grc_gr_trellis.m4')
diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4
index cde1f1cca8..6fbaa1ac81 100644
--- a/config/grc_gr_trellis.m4
+++ b/config/grc_gr_trellis.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -32,6 +32,12 @@ AC_DEFUN([GRC_GR_TRELLIS],[
])
passed=yes
+ # Don't do gr-trellis if gnuradio-core skipped
+ if test x$gnuradio_core_skipped = xyes; then
+ AC_MSG_RESULT([Component gr-trellis requires gnuradio-core, which is not being built or specified via pre-installed files.])
+ passed=no
+ fi
+
GRC_BUILD_CONDITIONAL([gr-trellis],[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_gr_trellis], [chmod +x gr-trellis/src/python/run_tests])
--
cgit v1.2.3