Merge branch 'next' into digital

3 files changed, 63 insertions, 6 deletions

diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4
index f5d94318e..2fccc83d1 100644
--- a/config/grc_gnuradio_examples.m4
+++ b/config/grc_gnuradio_examples.m4
@@ -28,20 +28,14 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
         gnuradio-examples/Makefile \
 	gnuradio-examples/python/Makefile \
 	gnuradio-examples/grc/Makefile \
-	gnuradio-examples/python/apps/hf_explorer/Makefile \
-   	gnuradio-examples/python/apps/hf_radio/Makefile \
-   	gnuradio-examples/python/apps/Makefile \
    	gnuradio-examples/python/digital/Makefile \
 	gnuradio-examples/python/digital-bert/Makefile \
    	gnuradio-examples/python/mp-sched/Makefile \
-   	gnuradio-examples/python/multi-antenna/Makefile \
    	gnuradio-examples/python/multi_usrp/Makefile \
    	gnuradio-examples/python/network/Makefile \
    	gnuradio-examples/python/ofdm/Makefile \
    	gnuradio-examples/python/pfb/Makefile \
    	gnuradio-examples/python/tags/Makefile \
-   	gnuradio-examples/python/usrp/Makefile \
-	gnuradio-examples/python/usrp2/Makefile \
 	gnuradio-examples/waveforms/Makefile \
     ])
 
diff --git a/config/grc_gr_shd.m4 b/config/grc_gr_shd.m4
new file mode 100644
index 000000000..d09505fbf
--- /dev/null
+++ b/config/grc_gr_shd.m4
@@ -0,0 +1,59 @@
+dnl Copyright 2011 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 3, or (at your option)
+dnl any later version.
+dnl 
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING.  If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_GR_SHD],[
+    GRC_ENABLE(gr-shd)
+
+    dnl Dont do gr-shd if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-shd, gnuradio-core)
+
+    if test $passed = yes; then
+        dnl Don't do gr-shd if the 'shd' package is not installed
+        PKG_CHECK_MODULES(
+            [SHD], [shd >= 3.1.0 shd < 3.2.0], [],
+            [passed=no; AC_MSG_RESULT([gr-shd requires libshd 3.1.x])]
+        )
+        SHD_CPPFLAGS="${SHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-shd/include"
+        AC_SUBST(SHD_CPPFLAGS)
+        AC_SUBST(SHD_LIBS)
+
+	# Use this to tell the Makefile whether to define
+	# GR_HAVE_SHD for swig.
+    fi
+
+    AM_CONDITIONAL([GR_DEFINE_HAVE_SHD],[test $passed = yes])
+
+    AC_CONFIG_FILES([ \
+        gr-shd/gnuradio-shd.pc \
+        gr-shd/Makefile \
+        gr-shd/grc/Makefile \
+        gr-shd/include/Makefile \
+        gr-shd/lib/Makefile \
+        gr-shd/swig/Makefile \
+        gr-shd/swig/run_tests \
+        gr-shd/swig/run_guile_tests \
+        gr-shd/apps/Makefile \
+    ])
+
+    GRC_BUILD_CONDITIONAL(gr-shd,[
+	dnl run_tests is created from run_tests.in.  Make it executable.
+	AC_CONFIG_COMMANDS([run_tests_shd],
+			   [chmod +x gr-shd/swig/run_tests gr-shd/swig/run_guile_tests])
+    ])
+])
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4
index 111b0ae43..f2170166b 100644
--- a/config/grc_gr_uhd.m4
+++ b/config/grc_gr_uhd.m4
@@ -49,6 +49,10 @@ AC_DEFUN([GRC_GR_UHD],[
         gr-uhd/swig/run_tests \
         gr-uhd/swig/run_guile_tests \
         gr-uhd/apps/Makefile \
+        gr-uhd/apps/hf_explorer/Makefile \
+        gr-uhd/apps/hf_radio/Makefile \
+	gr-uhd/examples/Makefile \
+	gr-uhd/examples/multi-antenna/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-uhd,[