Implemented consistent naming scheme for build system component macros

(GRC_*) and filenames (grc_*.m4).  Merged r3140:3159 from
/gnuradio/branches/developers/jcorgan/m4mfixes into trunk. Fixes
ticket #2.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3160 221aa14e-8319-0410-a670-987f0aec2ac5

21 files changed, 157 insertions, 141 deletions

diff --git a/config/gr_gnuradio_core.m4 b/config/gr_gnuradio_core.m4
deleted file mode 100644
index 661555eab..000000000
--- a/config/gr_gnuradio_core.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 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 2, 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., 59 Temple Place - Suite 330,
-dnl Boston, MA 02111-1307, USA.
-
-AC_DEFUN([GR_GNURADIO_CORE],[
-    AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
-
-    AC_CONFIG_FILES([ \
-	  gnuradio-core/Makefile
-	  gnuradio-core/gnuradio-core.pc \
-	  gnuradio-core/doc/Doxyfile \
-	  gnuradio-core/doc/Makefile \
-	  gnuradio-core/doc/other/Makefile \
-	  gnuradio-core/doc/xml/Makefile \
-	  gnuradio-core/src/Makefile \
-	  gnuradio-core/src/gen_interpolator_taps/Makefile \
-	  gnuradio-core/src/lib/Makefile \
-	  gnuradio-core/src/lib/filter/Makefile \
-	  gnuradio-core/src/lib/g72x/Makefile \
-	  gnuradio-core/src/lib/general/Makefile \
-	  gnuradio-core/src/lib/general/gr_prefix.cc \
-	  gnuradio-core/src/lib/io/Makefile \
-	  gnuradio-core/src/lib/missing/Makefile \
-	  gnuradio-core/src/lib/omnithread/Makefile \
-	  gnuradio-core/src/lib/reed-solomon/Makefile \
-	  gnuradio-core/src/lib/runtime/Makefile \
-	  gnuradio-core/src/lib/swig/Makefile \
-	  gnuradio-core/src/python/Makefile \
-	  gnuradio-core/src/python/bin/Makefile \
-	  gnuradio-core/src/python/gnuradio/Makefile \
-	  gnuradio-core/src/python/gnuradio/blks/Makefile \
-	  gnuradio-core/src/python/gnuradio/blksimpl/Makefile \
-	  gnuradio-core/src/python/gnuradio/gr/Makefile \
-	  gnuradio-core/src/python/gnuradio/gr/run_tests \
-	  gnuradio-core/src/python/gnuradio/gru/Makefile \
-	  gnuradio-core/src/python/gnuradio/gruimpl/Makefile \
-	  gnuradio-core/src/tests/Makefile \
-	  gnuradio-core/src/utils/Makefile \
-	])
-
-    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])
-
-    dnl kludge up initial swig dependency file
-    AC_CONFIG_COMMANDS([swig_deps], [touch gnuradio-core/src/lib/swig/gnuradio_swig_python.d])
-
-    subdirs="$subdirs gnuradio-core"
-])
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
new file mode 100644
index 000000000..04d2e29d4
--- /dev/null
+++ b/config/grc_gnuradio_core.m4
@@ -0,0 +1,63 @@
+dnl Copyright 2001,2002,2003,2004,2005,2006 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 2, 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., 59 Temple Place - Suite 330,
+dnl Boston, MA 02111-1307, USA.
+
+AC_DEFUN([GRC_GNURADIO_CORE],[
+    AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
+
+    AC_CONFIG_FILES([ \
+        gnuradio-core/Makefile
+        gnuradio-core/gnuradio-core.pc \
+        gnuradio-core/doc/Doxyfile \
+        gnuradio-core/doc/Makefile \
+        gnuradio-core/doc/other/Makefile \
+        gnuradio-core/doc/xml/Makefile \
+        gnuradio-core/src/Makefile \
+        gnuradio-core/src/gen_interpolator_taps/Makefile \
+        gnuradio-core/src/lib/Makefile \
+        gnuradio-core/src/lib/filter/Makefile \
+        gnuradio-core/src/lib/g72x/Makefile \
+        gnuradio-core/src/lib/general/Makefile \
+        gnuradio-core/src/lib/general/gr_prefix.cc \
+        gnuradio-core/src/lib/io/Makefile \
+        gnuradio-core/src/lib/missing/Makefile \
+        gnuradio-core/src/lib/omnithread/Makefile \
+        gnuradio-core/src/lib/reed-solomon/Makefile \
+        gnuradio-core/src/lib/runtime/Makefile \
+        gnuradio-core/src/lib/swig/Makefile \
+        gnuradio-core/src/python/Makefile \
+        gnuradio-core/src/python/bin/Makefile \
+        gnuradio-core/src/python/gnuradio/Makefile \
+        gnuradio-core/src/python/gnuradio/blks/Makefile \
+        gnuradio-core/src/python/gnuradio/blksimpl/Makefile \
+        gnuradio-core/src/python/gnuradio/gr/Makefile \
+        gnuradio-core/src/python/gnuradio/gr/run_tests \
+        gnuradio-core/src/python/gnuradio/gru/Makefile \
+        gnuradio-core/src/python/gnuradio/gruimpl/Makefile \
+        gnuradio-core/src/tests/Makefile \
+        gnuradio-core/src/utils/Makefile \
+	])
+
+    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])
+
+    dnl kludge up initial swig dependency file
+    AC_CONFIG_COMMANDS([swig_deps], [touch gnuradio-core/src/lib/swig/gnuradio_swig_python.d])
+
+    subdirs="$subdirs gnuradio-core"
+])
diff --git a/config/gr_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4
index 6ab51a20a..18afb6827 100644
--- a/config/gr_gnuradio_examples.m4
+++ b/config/grc_gnuradio_examples.m4
@@ -17,18 +17,18 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_GNURADIO_EXAMPLES],[
+AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
     AC_CONFIG_SRCDIR([gnuradio-examples/README])
 
     AC_CONFIG_FILES([\
-	  gnuradio-examples/Makefile \
-	  gnuradio-examples/python/Makefile \
-	  gnuradio-examples/python/audio/Makefile \
-	  gnuradio-examples/python/digital_voice/Makefile \
-	  gnuradio-examples/python/gmsk2/Makefile \
-	  gnuradio-examples/python/mc4020/Makefile \
-	  gnuradio-examples/python/usrp/Makefile \
-	  gnuradio-examples/python/multi_usrp/Makefile \
+        gnuradio-examples/Makefile \
+        gnuradio-examples/python/Makefile \
+        gnuradio-examples/python/audio/Makefile \
+        gnuradio-examples/python/digital_voice/Makefile \
+        gnuradio-examples/python/gmsk2/Makefile \
+        gnuradio-examples/python/mc4020/Makefile \
+        gnuradio-examples/python/usrp/Makefile \
+        gnuradio-examples/python/multi_usrp/Makefile \
 	])
 
     subdirs="$subdirs gnuradio-examples"
diff --git a/config/gr_atsc.m4 b/config/grc_gr_atsc.m4
index e409667ac..2f38ad3c4 100644
--- a/config/gr_atsc.m4
+++ b/config/grc_gr_atsc.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_ATSC],[
+AC_DEFUN([GRC_GR_ATSC],[
     AC_CONFIG_SRCDIR([gr-atsc/src/lib/atsc.i])
 
     AC_CONFIG_FILES([\
diff --git a/config/gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4
index 2675ec9c6..153f0ff38 100644
--- a/config/gr_audio_alsa.m4
+++ b/config/grc_gr_audio_alsa.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_AUDIO_ALSA],[
+AC_DEFUN([GRC_GR_AUDIO_ALSA],[
     AC_CONFIG_SRCDIR([gr-audio-alsa/src/audio_alsa.i])
 
     succeeded=yes
diff --git a/config/gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4
index 628ce0341..3d4a00dae 100644
--- a/config/gr_audio_jack.m4
+++ b/config/grc_gr_audio_jack.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_AUDIO_JACK],[
+AC_DEFUN([GRC_GR_AUDIO_JACK],[
     AC_CONFIG_SRCDIR([gr-audio-jack/src/audio_jack.i])
 
     succeeded=yes
diff --git a/config/gr_audio_oss.m4 b/config/grc_gr_audio_oss.m4
index c8dfebeb7..b0190d687 100644
--- a/config/gr_audio_oss.m4
+++ b/config/grc_gr_audio_oss.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_AUDIO_OSS],[
+AC_DEFUN([GRC_GR_AUDIO_OSS],[
     AC_CONFIG_SRCDIR([gr-audio-oss/src/audio_oss.i])
 
     succeeded=yes
diff --git a/config/gr_audio_osx.m4 b/config/grc_gr_audio_osx.m4
index 70a8f6b39..becc1c48c 100644
--- a/config/gr_audio_osx.m4
+++ b/config/grc_gr_audio_osx.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_AUDIO_OSX],[
+AC_DEFUN([GRC_GR_AUDIO_OSX],[
     AC_CONFIG_SRCDIR([gr-audio-osx/src/audio_osx.i])
 
     succeeded=yes
diff --git a/config/gr_audio_portaudio.m4 b/config/grc_gr_audio_portaudio.m4
index 2ad3719c4..193e2e313 100644
--- a/config/gr_audio_portaudio.m4
+++ b/config/grc_gr_audio_portaudio.m4
@@ -17,16 +17,14 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_AUDIO_PORTAUDIO],[
+AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[
     AC_CONFIG_SRCDIR([gr-audio-portaudio/src/audio_portaudio.i])
 
     succeeded=yes
-    #PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[],[succeeded=no])
-    AC_HAVE_LIBRARY([portaudio], [], [succeeded=no])
-    AC_CHECK_HEADER([portaudio.h], [], [succeeded=no])
+    PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[],[succeeded=no])
+    #AC_HAVE_LIBRARY([portaudio], [], [succeeded=no])
+    #AC_CHECK_HEADER([portaudio.h], [], [succeeded=no])
     if test $succeeded = yes; then
-        LIBS="$LIBS -lportaudio"
-
         AC_CONFIG_FILES([\
 	  gr-audio-portaudio/Makefile \
 	  gr-audio-portaudio/src/Makefile \
diff --git a/config/gr_audio_windows.m4 b/config/grc_gr_audio_windows.m4
index d0a445e9f..6bcdd63bb 100644
--- a/config/gr_audio_windows.m4
+++ b/config/grc_gr_audio_windows.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_AUDIO_WINDOWS],[
+AC_DEFUN([GRC_GR_AUDIO_WINDOWS],[
     AC_CONFIG_SRCDIR([gr-audio-windows/src/audio_windows.i])
 
     succeeded=yes
diff --git a/config/gr_comedi.m4 b/config/grc_gr_comedi.m4
index 89ee30fd8..eb996d14d 100644
--- a/config/gr_comedi.m4
+++ b/config/grc_gr_comedi.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_COMEDI],[
+AC_DEFUN([GRC_GR_COMEDI],[
     AC_CONFIG_SRCDIR([gr-comedi/src/comedi.i])
 
     succeeded=yes
diff --git a/config/gr_error_correcting_codes.m4 b/config/grc_gr_error_correcting_codes.m4
index 84d5560e3..630480056 100644
--- a/config/gr_error_correcting_codes.m4
+++ b/config/grc_gr_error_correcting_codes.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_ERROR_CORRECTING_CODES],[
+AC_DEFUN([GRC_GR_ERROR_CORRECTING_CODES],[
     AC_CONFIG_SRCDIR([gr-error-correcting-codes/src/lib/ecc.i])
 
     AC_CONFIG_FILES([\
diff --git a/config/gr_gsm_fr_vocoder.m4 b/config/grc_gr_gsm_fr_vocoder.m4
index 97408e9d1..3349dcc77 100644
--- a/config/gr_gsm_fr_vocoder.m4
+++ b/config/grc_gr_gsm_fr_vocoder.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_GSM_FR_VOCODER],[
+AC_DEFUN([GRC_GR_GSM_FR_VOCODER],[
     AC_CONFIG_SRCDIR([gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i])
 
     AC_CONFIG_FILES([\
diff --git a/config/gr_pmt.m4 b/config/grc_gr_pmt.m4
index 573f07dce..951d64056 100644
--- a/config/gr_pmt.m4
+++ b/config/grc_gr_pmt.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_PMT],[
+AC_DEFUN([GRC_GR_PMT],[
     AC_CONFIG_SRCDIR([pmt/src/lib/pmt.h])
 
     AC_CONFIG_FILES([\
diff --git a/config/gr_radar.m4 b/config/grc_gr_radar.m4
index b9a42d65b..139d9fe24 100644
--- a/config/gr_radar.m4
+++ b/config/grc_gr_radar.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_RADAR],[
+AC_DEFUN([GRC_GR_RADAR],[
     AC_CONFIG_SRCDIR([gr-radar/src/python/usrp_rx_radar.py])
 
     AC_CONFIG_FILES([\
diff --git a/config/gr_radio_astronomy.m4 b/config/grc_gr_radio_astronomy.m4
index db0ca61fc..0b445dbcb 100644
--- a/config/gr_radio_astronomy.m4
+++ b/config/grc_gr_radio_astronomy.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_RADIO_ASTRONOMY],[
+AC_DEFUN([GRC_GR_RADIO_ASTRONOMY],[
     AC_CONFIG_SRCDIR([gr-radio-astronomy/src/lib/ra.i])
 
     AC_CONFIG_FILES([\
diff --git a/config/grc_gr_usrp.m4 b/config/grc_gr_usrp.m4
new file mode 100644
index 000000000..2231905de
--- /dev/null
+++ b/config/grc_gr_usrp.m4
@@ -0,0 +1,47 @@
+dnl Copyright 2001,2002,2003,2004,2005,2006 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 2, 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., 59 Temple Place - Suite 330,
+dnl Boston, MA 02111-1307, USA.
+
+AC_DEFUN([GRC_GR_USRP],[
+    AC_CONFIG_SRCDIR([gr-usrp/src/usrp1.i])
+
+    # Don't do gr-usrp if usrp failed
+    # There *has* to be a better way to check if a value is in a string
+    succeeded=yes
+    for dir in $failed
+    do
+	if test $dir = usrp; then
+	    succeeded=no
+	fi
+    done
+
+    if test $succeeded = yes; then
+	AC_CONFIG_FILES([\
+	  gr-usrp/Makefile \
+	  gr-usrp/src/Makefile \
+	  gr-usrp/src/run_tests \
+	])
+
+	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])
+
+	subdirs="$subdirs gr-usrp"
+    else
+	failed="$failed gr-usrp"
+    fi
+])
diff --git a/config/gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4
index 2f5249869..1432ccd67 100644
--- a/config/gr_video_sdl.m4
+++ b/config/grc_gr_video_sdl.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_VIDEO_SDL],[
+AC_DEFUN([GRC_GR_VIDEO_SDL],[
     AC_CONFIG_SRCDIR([gr-video-sdl/src/video_sdl.i])
 
     succeeded=yes
diff --git a/config/gr_wxgui.m4 b/config/grc_gr_wxgui.m4
index 4ff56509e..8f3c8f8ee 100644
--- a/config/gr_wxgui.m4
+++ b/config/grc_gr_wxgui.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_WXGUI],[
+AC_DEFUN([GRC_GR_WXGUI],[
     AC_CONFIG_SRCDIR([gr-wxgui/src/python/stdgui.py])
 
     # FIXME: Should we actually check for wxPython, even though
diff --git a/config/gr_usrp.m4 b/config/grc_usrp.m4
index a51d77ca2..be75387ec 100644
--- a/config/gr_usrp.m4
+++ b/config/grc_usrp.m4
@@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING.  If not, write to
 dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl Boston, MA 02111-1307, USA.
 
-AC_DEFUN([GR_USRP_HW],[
+AC_DEFUN([GRC_USRP],[
     AC_CONFIG_SRCDIR([usrp/host/lib/usrp_prims.h])
 
     AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
@@ -82,32 +82,3 @@ AC_DEFUN([GR_USRP_HW],[
 	failed="$failed usrp"
     fi
 ])
-
-AC_DEFUN([GR_USRP],[
-    AC_CONFIG_SRCDIR([gr-usrp/src/usrp1.i])
-
-    # Don't do gr-usrp if usrp failed
-    # There *has* to be a better way to check if a value is in a string
-    succeeded=yes
-    for dir in $failed
-    do
-	if test $dir = usrp; then
-	    succeeded=no
-	fi
-    done
-
-    if test $succeeded = yes; then
-	AC_CONFIG_FILES([\
-	  gr-usrp/Makefile \
-	  gr-usrp/src/Makefile \
-	  gr-usrp/src/run_tests \
-	])
-
-	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])
-
-	subdirs="$subdirs gr-usrp"
-    else
-	failed="$failed gr-usrp"
-    fi
-])
diff --git a/configure.ac b/configure.ac
index 9486bf510..68e8837c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,25 +143,25 @@ AC_SUBST(STD_DEFINES_AND_INCLUDES)
 dnl Component specific configuration
 dnl The order of the GR_ macros determines the order of compilation
 subdirs="config"
-GR_GNURADIO_CORE
-GR_GNURADIO_EXAMPLES
-GR_USRP_HW
-GR_USRP				dnl this must come after GR_USRP_HW
-GR_AUDIO_ALSA
-GR_AUDIO_JACK
-GR_AUDIO_OSS
-#GR_AUDIO_PORTAUDIO		dnl Disabled until portaudio patch figured out
-GR_AUDIO_OSX			dnl ***NOT TESTED***
-GR_AUDIO_WINDOWS		dnl ***NOT TESTED***
-GR_ATSC
-GR_COMEDI
-GR_ERROR_CORRECTING_CODES
-GR_GSM_FR_VOCODER
-GR_RADAR
-GR_RADIO_ASTRONOMY
-GR_PMT
-GR_VIDEO_SDL
-GR_WXGUI
+GRC_GNURADIO_CORE
+GRC_GNURADIO_EXAMPLES
+GRC_USRP
+GRC_GR_USRP			dnl this must come after GRC_USRP
+GRC_GR_AUDIO_ALSA
+GRC_GR_AUDIO_JACK
+GRC_GR_AUDIO_OSS
+GRC_GR_AUDIO_OSX		dnl ***NOT TESTED***
+GRC_GR_AUDIO_PORTAUDIO		dnl ***NOT TESTED***
+GRC_GR_AUDIO_WINDOWS		dnl ***NOT TESTED***
+GRC_GR_ATSC
+GRC_GR_COMEDI
+GRC_GR_ERROR_CORRECTING_CODES
+GRC_GR_GSM_FR_VOCODER
+GRC_GR_RADAR
+GRC_GR_RADIO_ASTRONOMY
+GRC_GR_PMT
+GRC_GR_VIDEO_SDL
+GRC_GR_WXGUI
 
 dnl Has list of successfully configured components
 AC_SUBST([subdirs],$subdirs)