Merge branch 'next' of http://gnuradio.org/git/gnuradio into next

16 files changed, 221 insertions, 134 deletions

diff --git a/config/Makefile.am b/config/Makefile.am
index 4dc7216f1..68ff3c78c 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -90,7 +90,6 @@ m4macros = \
 	gr_require_mc4020.m4 \
 	gr_scripting.m4 \
 	gr_set_md_cpu.m4 \
-	gr_standalone.m4 \
 	gr_subversion.m4 \
 	gr_swig.m4 \
 	gr_sysv_shm.m4 \
@@ -108,4 +107,4 @@ m4macros = \
 	usrp_libusb.m4 \
 	usrp_sdcc.m4
 
-EXTRA_DIST = $(m4macros) 
+EXTRA_DIST += $(m4macros)
diff --git a/config/gr_guile.m4 b/config/gr_guile.m4
new file mode 100644
index 000000000..4d8d61d43
--- /dev/null
+++ b/config/gr_guile.m4
@@ -0,0 +1,72 @@
+dnl
+dnl Copyright 2003,2004,2005 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.
+dnl 
+
+# GUILE_DEVEL()
+#
+# Checks for Guile and tries to get the include path to 'Guile.h'.
+# It sets the $(GUILE_CPPFLAGS), $(GUILE_LDFLAGS) and $(guiledir) output variables,
+#
+AC_DEFUN([GUILE_DEVEL],[
+    dnl see if GUILE is installed
+    AC_PATH_PROG(GUILE, guile)
+    dnl get the config program
+    AC_PATH_PROG(GUILE_CONFIG, guile-config)
+    if test x${GUILE_CONFIG} != x; then
+      GUILE_CFLAGS="`${GUILE_CONFIG} compile`"
+      GUILE_LIBS="`${GUILE_CONFIG} link`"
+      GUILE_PKLIBDIR="`${GUILE_CONFIG} info pkglibdir`"
+      GUILE_PKDATADIR="`${GUILE_CONFIG} info pkgdatadir`/site"
+    else
+      AC_MSG_ERROR([You need to install the guile development files (e.g., libguile-dev, guile-devel, etc.)!])
+      GUILE_CFLAGS=""
+      GUILE_PKLIBDIR=""
+      GUILE_LIBS="Wl,-Bsymbolic-functions -lguile -lgmp -lcrypt"
+    fi
+    AC_SUBST(GUILE_CFLAGS)
+    AC_SUBST(GUILE_PKLIBDIR)
+    AC_SUBST(GUILE_PKDATADIR)
+    AC_SUBST(GUILE_LIBS)
+
+    dnl see if we've got lt_dladvise_global (libtool-2.*)
+    AC_SEARCH_LIBS([lt_dladvise_global],[ltdl],
+		   [AC_DEFINE([HAVE_LT_DLADVISE_GLOBAL], [1],
+		              [Define if lt_dladvise_global exists.])],
+		   [],[])
+])
+
+# GUILE_CHECK_MODULE
+#
+# Determines if a particular Guile module can be imported
+#
+# $1 - module name
+# $2 - module description
+# $3 - action if found
+# $4 - action if not found
+# $5 - test command
+
+AC_DEFUN([GUILE_CHECK_MODULE],[
+    AC_MSG_CHECKING([for $2])
+    dnl ########################################
+    dnl # import and test checking
+    dnl ########################################
+  dnl if test x${enable_guile} = xyes; then
+  dnl fi
+])
diff --git a/config/gr_scripting.m4 b/config/gr_scripting.m4
index e030a8102..866b7e017 100644
--- a/config/gr_scripting.m4
+++ b/config/gr_scripting.m4
@@ -26,5 +26,13 @@ AC_DEFUN([GR_SCRIPTING],[
 
   SWIG_PROG(1.3.31)
   SWIG_ENABLE_CXX
-  SWIG_PYTHON
+  dnl We need python at build time, as it's used as for utilities. If python
+  dnl isn't enabled, then we don't want the SWIG support for python.
+  AC_REQUIRE([AM_PATH_PYTHON])
+  if test x${enable_python} = xyes; then
+    SWIG_PYTHON
+  fi
+  if test x${enable_guile} = xyes; then
+    SWIG_GUILE
+  fi
 ])
diff --git a/config/gr_standalone.m4 b/config/gr_standalone.m4
deleted file mode 100644
index 370f7fb03..000000000
--- a/config/gr_standalone.m4
+++ /dev/null
@@ -1,116 +0,0 @@
-dnl
-dnl Copyright 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 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 along
-dnl with this program; if not, write to the Free Software Foundation, Inc.,
-dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-dnl
-
-dnl
-dnl GR_STANDALONE([package],[version])
-dnl
-dnl Handles the bulk of the configure.ac work for an out-of-tree build
-dnl
-dnl N.B., this is an m4_define because if it were an AC_DEFUN it would
-dnl get called too late to be useful.
-
-m4_define([GR_STANDALONE],
-[
-  AC_INIT([$1],[$2])
-  AC_PREREQ(2.57)
-  AC_CONFIG_SRCDIR([config/gr_standalone.m4])
-  AC_CONFIG_AUX_DIR([.])	
-  AM_CONFIG_HEADER(config.h)
-
-  AC_CANONICAL_BUILD
-  AC_CANONICAL_HOST
-  AC_CANONICAL_TARGET
-
-  AM_INIT_AUTOMAKE
-
-  LF_CONFIGURE_CC
-  LF_CONFIGURE_CXX
-  GR_LIB64		dnl check for lib64 suffix after choosing compilers
-
-  dnl add ${prefix}/lib${gr_libdir_suffix}/pkgconfig to the head of the PKG_CONFIG_PATH
-  if test x${PKG_CONFIG_PATH} = x; then
-      PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig
-  else
-      PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig:${PKG_CONFIG_PATH}
-  fi
-  export PKG_CONFIG_PATH
-
-  LF_SET_WARNINGS
-  GR_SET_GPROF
-  GR_SET_PROF
-  AM_PROG_AS
-  AC_PROG_LN_S
-  AC_PROG_MAKE_SET
-  AC_PROG_INSTALL
-  AC_PATH_PROG([RM_PROG], [rm])
-
-  AC_LIBTOOL_WIN32_DLL
-  AC_ENABLE_SHARED	dnl do build shared libraries
-  AC_DISABLE_STATIC	dnl don't build static libraries
-  m4_ifdef([LT_INIT],[LT_INIT],[AC_PROG_LIBTOOL])
-  dnl GR_FORTRAN
-
-  GR_NO_UNDEFINED	dnl do we need the -no-undefined linker flag
-  GR_SCRIPTING		dnl Locate python, SWIG, etc
-
-  AC_ARG_WITH([python],
-    AC_HELP_STRING([--with-python], [Should we use python? [[default=yes]]]),
-    [case "$with_python" in
-      (no | yes) ;;
-      (*) AC_MSG_ERROR([Invalid argument ($with_python) to --with-python]) ;;
-     esac],
-    [with_python=yes])
-
-  AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes])
-
-
-  dnl Set the c++ compiler that we use for the build system when cross compiling
-  if test "x$CXX_FOR_BUILD" = x
-  then
-    CXX_FOR_BUILD=${CXX}
-  fi
-  AC_SUBST(CXX_FOR_BUILD)
-
-  dnl Checks for header files.
-  AC_HEADER_STDC
-
-  dnl Checks for typedefs, structures, and compiler characteristics.
-  AC_C_CONST
-  AC_C_INLINE
-  AC_TYPE_SIZE_T
-  AC_HEADER_TIME
-  AC_C_BIGENDIAN
-
-  dnl Check for Mingw support
-  GR_PWIN32
-
-  AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
-  AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
-
-  dnl Define where to look for cppunit includes and libs
-  dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS
-  dnl Try using pkg-config first, then fall back to cppunit-config.
-  PKG_CHECK_EXISTS(cppunit,
-    [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)],
-    [AM_PATH_CPPUNIT([1.9.14],[],
-		     [AC_MSG_ERROR([GNU Radio requires cppunit.  Stop])])])
-
-  PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3)
-])
diff --git a/config/gr_swig.m4 b/config/gr_swig.m4
index cdb28055c..dcc2e72dc 100644
--- a/config/gr_swig.m4
+++ b/config/gr_swig.m4
@@ -26,7 +26,7 @@ dnl
 # is greater or equal to the value of the argument.  It should have the format:
 # N[.N[.N]] (N is a number between 0 and 999.  Only the first N is mandatory.)
 AC_DEFUN([SWIG_PROG],[
-	AC_REQUIRE([AC_PROG_MAKE_SET])
+    AC_REQUIRE([AC_PROG_MAKE_SET])
 	AC_CHECK_PROG(SWIG,swig,[`which swig`])
 	if test -z "$SWIG" ; then
 		AC_MSG_ERROR([Cannot find 'swig' program.  SWIG version >= $1 required])
@@ -56,9 +56,9 @@ AC_DEFUN([SWIG_PROG],[
 AC_DEFUN([SWIG_ENABLE_CXX],[
 	AC_REQUIRE([SWIG_PROG])
 	AC_REQUIRE([AC_PROG_CXX])
-	if test "$SWIG" != "false" ; then
+    	if test "$SWIG" != "false" ; then
 		SWIG="$SWIG -c++"
-	fi
+        fi
 ])
 
 # SWIG_PYTHON([use-shadow-classes])
@@ -83,3 +83,27 @@ dnl		AC_SUBST(SWIG_PYTHON_OPT,[-python$swig_shadow])
 	fi
 	AC_SUBST(SWIG_PYTHON_CPPFLAGS,[$PYTHON_CPPFLAGS])
 ])
+
+AC_DEFUN([SWIG_TCL],[
+	AC_REQUIRE([SWIG_PROG])
+	AC_REQUIRE([TCL_DEVEL])
+	if test "$SWIG" != "false" ; then
+		AC_SUBST(SWIG_TCL_LIB,[-ltcl])
+dnl		test ! "x$1" = "xno" && swig_shadow=" -shadow" || swig_shadow=""
+dnl		AC_SUBST(SWIG_PYTHON_OPT,[-python$swig_shadow])
+		AC_SUBST(SWIG_TCL_OPT,[-tcl])
+	fi
+	AC_SUBST(SWIG_TCL_CPPFLAGS,[$TCL_CPPFLAGS])
+])
+
+AC_DEFUN([SWIG_GUILE],[
+	AC_REQUIRE([SWIG_PROG])
+	AC_REQUIRE([GUILE_DEVEL])
+	if test "$SWIG" != "false" ; then
+		AC_SUBST(SWIG_GUILE_LIB,[-lguile])
+dnl		test ! "x$1" = "xno" && swig_shadow=" -shadow" || swig_shadow=""
+dnl		AC_SUBST(SWIG_PYTHON_OPT,[-python$swig_shadow])
+		AC_SUBST(SWIG_GUILE_OPT,[-guile])
+	fi
+	AC_SUBST(SWIG_GUILE_CPPFLAGS,[$GUILE_CPPFLAGS])
+])
diff --git a/config/gr_tcl.m4 b/config/gr_tcl.m4
new file mode 100644
index 000000000..106bc6515
--- /dev/null
+++ b/config/gr_tcl.m4
@@ -0,0 +1,69 @@
+dnl
+dnl Copyright 2003,2004,2005 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.
+dnl 
+
+# TCL_DEVEL()
+#
+# Checks for Tcl and tries to get the include path to 'Tcl.h'.
+# It sets the $(TCL_CPPFLAGS), $(TCL_LDFLAGS) and $(tcldir) output variables,
+#
+AC_DEFUN([TCL_DEVEL],[
+    dnl see if tclsh is installed
+    if test x${enable_tcl} = xyes; then
+        AC_PATH_PROG(TCLSH,tclsh)
+
+	AC_REQUIRE([AC_CANONICAL_HOST])
+
+	AC_ARG_WITH(tcldir,
+                    AC_HELP_STRING([--with-tcldir=DIR], 
+                       [tcl installation directory (cross-compiling) [[default=$prefix/lib/tcl2.5/site-packages]]]),
+		    [with_tcldir=${withval}],[with_tcldir=${prefix}/lib/tcl2.5/site-packages])
+
+	# if we're cross-compiling, asking the host tcl about any of
+	# this is completely useless...
+
+	dnl if test x$cross_compiling != xno; then
+	dnl 	tcldir=$with_tcldir
+	dnl 	pyexecdir=$with_tcldir
+	dnl 	AC_SUBST(TCL_CPPFLAGS)
+	dnl 	AC_SUBST(TCL_LDFLAGS)
+        dnl else
+	dnl fi
+    fi
+])
+
+# TCL_CHECK_MODULE
+#
+# Determines if a particular Tcl module can be imported
+#
+# $1 - module name
+# $2 - module description
+# $3 - action if found
+# $4 - action if not found
+# $5 - test command
+
+AC_DEFUN([TCL_CHECK_MODULE],[
+    AC_MSG_CHECKING([for $2])
+    dnl ########################################
+    dnl # import and test checking
+    dnl ########################################
+  dnl if test x${enable_tcl} = xyes; then
+  dnl fi
+])
diff --git a/config/grc_build.m4 b/config/grc_build.m4
index 77b59db6b..121c4feb6 100644
--- a/config/grc_build.m4
+++ b/config/grc_build.m4
@@ -259,6 +259,7 @@ AC_DEFUN([_GRC_BUILD_CONDITIONAL],[
 	    GRC_ADD_TO_LIST($3, PYDIRPATH, ":")
 	    GRC_ADD_TO_LIST($3, SWIGDIRPATH, ":")
 	    GRC_ADD_TO_LIST($3, LIBDIRPATH, ":")
+	    GRC_ADD_TO_LIST($3, GUILE_LOAD_PATH, ":")
 	    AC_MSG_RESULT([Component $1 will be included from a pre-installed library and includes.])
 	    $3[_with]=yes
 	else
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
index 269634324..15086be0f 100644
--- a/config/grc_gnuradio_core.m4
+++ b/config/grc_gnuradio_core.m4
@@ -26,6 +26,8 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
 	gnuradio_core_I="$gnuradio_core_SWIGDIRPATH/gnuradio.i"
 	gnuradio_core_SWIG_INCLUDES="-I$gnuradio_core_SWIGDIRPATH"
 	gnuradio_core_PYDIRPATH=$pythondir
+	gnuradio_core_GUILE_LOAD_PATH="`pkg-config --variable=guile_load_path gnuradio-core`"
+	gnuradio_core_LIBDIRPATH="`pkg-config --variable=libdir gnuradio-core`"
     ])
 
     dnl Don't do gnuradio-core if gruel skipped
@@ -61,9 +63,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/hier \
--I\${abs_top_builddir}/gnuradio-core/src/lib/swig \
-\$(FFTW3F_CFLAGS) \
-\$(GSL_CFLAGS)"
+-I\${abs_top_builddir}/gnuradio-core/src/lib/swig"
         gnuradio_core_LA="\${abs_top_builddir}/gnuradio-core/src/lib/libgnuradio-core.la"
 	dnl gnuradio_core_I="\${abs_top_srcdir}/gnuradio-core/src/lib/swig/gnuradio.i"
 	gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs"
@@ -81,6 +81,9 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
         gnuradio-core/gnuradio-core.pc \
         gnuradio-core/src/Makefile \
         gnuradio-core/src/gen_interpolator_taps/Makefile \
+	gnuradio-core/src/guile/Makefile \
+	gnuradio-core/src/guile/run_guile_tests \
+	gnuradio-core/src/guile/gr-run-waveform-script \
         gnuradio-core/src/lib/Makefile \
         gnuradio-core/src/lib/filter/Makefile \
         gnuradio-core/src/lib/g72x/Makefile \
@@ -110,6 +113,10 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
 
     GRC_BUILD_CONDITIONAL(gnuradio-core, [
         dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_core],[chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests])
+        AC_CONFIG_COMMANDS([run_tests_core],
+	[
+	  chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests
+	  chmod +x gnuradio-core/src/guile/run_guile_tests
+	])
     ])
 ])
diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4
index 4d6116c70..0aad0c0da 100644
--- a/config/grc_gnuradio_examples.m4
+++ b/config/grc_gnuradio_examples.m4
@@ -43,6 +43,7 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
    	gnuradio-examples/python/pfb/Makefile \
    	gnuradio-examples/python/usrp/Makefile \
 	gnuradio-examples/python/usrp2/Makefile \
+	gnuradio-examples/waveforms/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gnuradio-examples)
diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4
index d6955980d..35389d81d 100644
--- a/config/grc_gr_audio_alsa.m4
+++ b/config/grc_gr_audio_alsa.m4
@@ -37,11 +37,13 @@ AC_DEFUN([GRC_GR_AUDIO_ALSA],[
         gr-audio-alsa/Makefile \
 	gr-audio-alsa/gnuradio-audio-alsa.pc \
         gr-audio-alsa/src/Makefile \
+	gr-audio-alsa/src/run_guile_tests \
         gr-audio-alsa/src/run_tests \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-audio-alsa,[
 	dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_alsa], [chmod +x gr-audio-alsa/src/run_tests])
+        AC_CONFIG_COMMANDS([run_tests_alsa],
+			   [chmod +x gr-audio-alsa/src/run_tests gr-audio-alsa/src/run_guile_tests])
     ])
 ])
diff --git a/config/grc_gr_noaa.m4 b/config/grc_gr_noaa.m4
index 69d0aad55..54df77503 100644
--- a/config/grc_gr_noaa.m4
+++ b/config/grc_gr_noaa.m4
@@ -33,10 +33,13 @@ AC_DEFUN([GRC_GR_NOAA],[
 	gr-noaa/oct/Makefile \
 	gr-noaa/python/Makefile \
 	gr-noaa/swig/Makefile \
+	gr-noaa/swig/run_guile_tests \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-noaa,[
         dnl run_tests is created from run_tests.in.  Make it executable.
-        #AC_CONFIG_COMMANDS([run_tests_noaa], [chmod +x gr-pager/lib/run_tests])
+        AC_CONFIG_COMMANDS([run_tests_noaa],
+			   [chmod +x gr-noaa/swig/run_guile_tests])
+
     ])
 ])
diff --git a/config/grc_gr_pager.m4 b/config/grc_gr_pager.m4
index cdd6177af..5330fce3a 100644
--- a/config/grc_gr_pager.m4
+++ b/config/grc_gr_pager.m4
@@ -32,10 +32,13 @@ AC_DEFUN([GRC_GR_PAGER],[
 	gr-pager/python/Makefile \
 	gr-pager/python/run_tests \
 	gr-pager/swig/Makefile \
+	gr-pager/swig/run_guile_tests \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-pager,[
         dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x gr-pager/python/run_tests])
+        AC_CONFIG_COMMANDS([run_tests_pager],
+			   [chmod +x gr-pager/python/run_tests
+			    chmod +x gr-pager/swig/run_guile_tests])
     ])
 ])
diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4
index cb51325d6..bc9ca6f49 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,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2010 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -29,6 +29,7 @@ AC_DEFUN([GRC_GR_TRELLIS],[
         gr-trellis/doc/Makefile \
         gr-trellis/src/Makefile \
         gr-trellis/src/lib/Makefile \
+        gr-trellis/src/lib/run_guile_tests \
         gr-trellis/src/python/Makefile \
         gr-trellis/src/python/run_tests \
         gr-trellis/src/examples/Makefile \
@@ -37,6 +38,8 @@ AC_DEFUN([GRC_GR_TRELLIS],[
 
     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])
+	AC_CONFIG_COMMANDS([run_tests_gr_trellis],
+	                   [chmod +x gr-trellis/src/python/run_tests;
+			    chmod +x gr-trellis/src/lib/run_guile_tests])
     ])
 ])
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4
index a9404425a..80052bb50 100644
--- a/config/grc_gr_uhd.m4
+++ b/config/grc_gr_uhd.m4
@@ -44,7 +44,13 @@ AC_DEFUN([GRC_GR_UHD],[
         gr-uhd/grc/Makefile \
         gr-uhd/lib/Makefile \
         gr-uhd/swig/Makefile \
+        gr-uhd/swig/run_tests \
+        gr-uhd/swig/run_guile_tests \
     ])
 
-    GRC_BUILD_CONDITIONAL(gr-uhd)
+    GRC_BUILD_CONDITIONAL(gr-uhd,[
+	dnl run_tests is created from run_tests.in.  Make it executable.
+	AC_CONFIG_COMMANDS([run_tests_uhd],
+			   [chmod +x gr-uhd/swig/run_tests gr-uhd/swig/run_guile_tests])
+    ])
 ])
diff --git a/config/grc_gr_usrp.m4 b/config/grc_gr_usrp.m4
index 1f2cd1ac7..b850f0050 100644
--- a/config/grc_gr_usrp.m4
+++ b/config/grc_gr_usrp.m4
@@ -29,11 +29,14 @@ AC_DEFUN([GRC_GR_USRP],[
 	gr-usrp/gnuradio-usrp.pc \
         gr-usrp/src/Makefile \
         gr-usrp/src/run_tests \
+	gr-usrp/src/run_guile_tests \
 	gr-usrp/apps/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-usrp,[
 	dnl run_tests is created from run_tests.in.  Make it executable.
-	AC_CONFIG_COMMANDS([run_tests_usrp], [chmod +x gr-usrp/src/run_tests])
+	AC_CONFIG_COMMANDS([run_tests_usrp],
+			   [chmod +x gr-usrp/src/run_tests
+			    chmod +x gr-usrp/src/run_guile_tests])
     ])
 ])
diff --git a/config/grc_gr_usrp2.m4 b/config/grc_gr_usrp2.m4
index 4cac5ca08..5a9bb3b70 100644
--- a/config/grc_gr_usrp2.m4
+++ b/config/grc_gr_usrp2.m4
@@ -29,10 +29,12 @@ AC_DEFUN([GRC_GR_USRP2],[
 	gr-usrp2/gnuradio-usrp2.pc \
         gr-usrp2/src/Makefile \
         gr-usrp2/src/run_tests \
+        gr-usrp2/src/run_guile_tests \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-usrp2,[
 	dnl run_tests is created from run_tests.in.  Make it executable.
-	AC_CONFIG_COMMANDS([run_tests_usrp2], [chmod +x gr-usrp2/src/run_tests])
+	AC_CONFIG_COMMANDS([run_tests_usrp2],
+			   [chmod +x gr-usrp2/src/run_tests gr-usrp2/src/run_guile_tests])
     ])
 ])