3 files changed, 3 insertions, 37 deletions
diff --git a/config/Makefile.am b/config/Makefile.am
index 6e8f81987..e525ccf36 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -61,7 +61,6 @@ m4macros = \
 	grc_gr_gcell.m4 \
 	grc_gr_gpio.m4 \
 	grc_gr_gsm_fr_vocoder.m4 \
-	grc_gr_guile.m4 \
 	grc_gr_noaa.m4 \
 	grc_gr_radar_mono.m4 \
 	grc_gr_radio_astronomy.m4 \
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
index ff3df8c60..e60bdac59 100644
--- a/config/grc_gnuradio_core.m4
+++ b/config/grc_gnuradio_core.m4
@@ -85,6 +85,8 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
         gnuradio-core/src/gen_interpolator_taps/Makefile \
 	gnuradio-core/src/guile/Makefile \
 	gnuradio-core/src/guile/run_guile_tests \
+	gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform \
+	gnuradio-core/src/guile/example-waveforms/Makefile \
         gnuradio-core/src/lib/Makefile \
         gnuradio-core/src/lib/filter/Makefile \
         gnuradio-core/src/lib/g72x/Makefile \
@@ -118,6 +120,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
 	[
 	  chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests
 	  chmod +x gnuradio-core/src/guile/run_guile_tests
+	  chmod +x gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform
 	])
     ])
 ])
diff --git a/config/grc_gr_guile.m4 b/config/grc_gr_guile.m4
deleted file mode 100644
index 35d6834eb..000000000
--- a/config/grc_gr_guile.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009,2010 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_GUILE],[
-    GRC_ENABLE(gr-guile)
-
-    dnl Don't do gr-guile if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-guile, gnuradio-core)
-
-    AC_CONFIG_FILES([ \
-        gr-guile/Makefile \
-        gr-guile/apps/Makefile \
-        gr-guile/example-waveforms/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-guile,[
-	dnl run_tests is created from run_tests.in.  Make it executable.
-	dnl AC_CONFIG_COMMANDS([run_tests_guile], [chmod +x gr-guile/apps/run_guile_tests])
-    ])
-])