Removed autotools, gr-waveform, some cleanup

Nick Foster owes Nick Corgan a six-pack of beer!

82 files changed, 0 insertions, 6647 deletions

diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100644
index 16f775e32..000000000
--- a/config/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
-/Makefile
-/Makefile.in
-/libtool.m4
-/lt~obsolete.m4
-/ltsugar.m4
-/ltversion.m4
-/ltoptions.m4
diff --git a/config/Makefile.am b/config/Makefile.am
deleted file mode 100644
index 003a0f6ae..000000000
--- a/config/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright 2001,2006,2008,2009,2010 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# Install m4 macros in this directory
-m4datadir = $(datadir)/aclocal
-
-# List your m4 macros here
-m4macros = \
-	acx_cblas.m4 \
-	acx_pthread.m4 \
-	ax_boost_base.m4 \
-	ax_boost_date_time.m4 \
-	ax_boost_filesystem.m4 \
-	ax_boost_iostreams.m4 \
-	ax_boost_program_options.m4 \
-	ax_boost_python.m4 \
-	ax_boost_regex.m4 \
-	ax_boost_serialization.m4 \
-	ax_boost_signals.m4 \
-	ax_boost_system.m4 \
-	ax_boost_test_exec_monitor.m4 \
-	ax_boost_thread.m4 \
-	ax_boost_unit_test_framework.m4 \
-	ax_boost_wserialization.m4 \
-	bnv_have_qt.m4 \
-	cppunit.m4 \
-	grc_build.m4 \
-	grc_docs.m4 \
-	grc_gnuradio_core.m4 \
-	grc_gnuradio_examples.m4 \
-	grc_grc.m4 \
-	grc_gr_atsc.m4 \
-	grc_gr_audio.m4 \
-	grc_gr_comedi.m4 \
-	grc_gr_noaa.m4 \
-	grc_gr_trellis.m4 \
-	grc_gr_video_sdl.m4 \
-	grc_gr_vocoder.m4 \
-	grc_gr_wxgui.m4 \
-	grc_gruel.m4 \
-	gr_check_createfilemapping.m4 \
-	gr_check_mc4020.m4 \
-	gr_check_shm_open.m4 \
-	gr_doxygen.m4 \
-	gr_fortran.m4 \
-	gr_git.m4 \
-	gr_gprof.m4 \
-	gr_lib64.m4 \
-	gr_libgnuradio_core_extra_ldflags.m4 \
-	gr_no_undefined.m4 \
-	gr_pwin32.m4 \
-	gr_python.m4 \
-	gr_require_mc4020.m4 \
-	gr_scripting.m4 \
-	gr_set_md_cpu.m4 \
-	gr_subversion.m4 \
-	gr_swig.m4 \
-	gr_sysv_shm.m4 \
-	gr_version.m4 \
-	gr_vmcircbuf.m4 \
-	lf_cc.m4 \
-	lf_cxx.m4 \
-	lf_warnings.m4 \
-	lf_x11.m4 \
-	macosx_audiounit.m4 \
-	mkstemp.m4 \
-	onceonly.m4 \
-	pkg.m4 \
-	sdl.m4
-
-EXTRA_DIST += $(m4macros)
diff --git a/config/acx_cblas.m4 b/config/acx_cblas.m4
deleted file mode 100644
index 38d859828..000000000
--- a/config/acx_cblas.m4
+++ /dev/null
@@ -1,227 +0,0 @@
-# ===========================================================================
-#                http://autoconf-archive.cryp.to/acx_blas.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   ACX_CBLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro looks for a library that implements the CBLAS linear-algebra
-#   interface (see http://www.netlib.org/blas/). On success, it sets the
-#   CBLAS_LIBS output variable to hold the requisite library linkages.
-#
-#   To link with BLAS, you should link with:
-#
-#   	$CBLAS_LIBS $LIBS
-#
-#   Many libraries are searched for, from ATLAS to CXML to ESSL. The user
-#   may also use --with-blas=<lib> in order to use some specific CBLAS
-#   library <lib>. In order to link successfully, however, be aware that you
-#   will probably need to use the same Fortran compiler (which can be set
-#   via the F77 env. var.) as was used to compile the BLAS library.
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a CBLAS library is
-#   found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is
-#   not found. If ACTION-IF-FOUND is not specified, the default action will
-#   define HAVE_CBLAS.
-#
-#   This macro requires autoconf 2.50 or later.
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Macro Archive. When you make and
-#   distribute a modified version of the Autoconf Macro, you may extend this
-#   special exception to the GPL to apply to your modified version as well.
-
-AC_DEFUN([ACX_CBLAS], [
-AC_PREREQ(2.50)
-dnl AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
-AC_REQUIRE([AC_CANONICAL_HOST])
-acx_cblas_ok=no
-
-AC_ARG_WITH(cblas,
-	[AC_HELP_STRING([--with-cblas=<lib>], [use CBLAS library <lib>])])
-case $with_cblas in
-	yes | "") ;;
-	no) acx_cblas_ok=disable ;;
-	-* | */* | *.a | *.so | *.so.* | *.o) CBLAS_LIBS="$with_cblas" ;;
-	*) CBLAS_LIBS="-l$with_cblas" ;;
-esac
-
-
-acx_cblas_save_LIBS="$LIBS"
-LIBS="$LIBS $FLIBS"
-
-# First, check CBLAS_LIBS environment variable
-if test $acx_cblas_ok = no; then
-if test "x$CBLAS_LIBS" != x; then
-	save_LIBS="$LIBS"; LIBS="$CBLAS_LIBS $LIBS"
-	AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-	AC_TRY_LINK_FUNC(cblas_sgemm, [acx_cblas_ok=yes], [CBLAS_LIBS=""])
-	AC_MSG_RESULT($acx_cblas_ok)
-	LIBS="$save_LIBS"
-fi
-fi
-
-# CBLAS linked to by default?  (happens on some supercomputers)
-if test $acx_cblas_ok = no; then
-	save_LIBS="$LIBS"; LIBS="$LIBS"
-	AC_CHECK_FUNC(cblas_sgemm, [acx_cblas_ok=yes])
-	LIBS="$save_LIBS"
-fi
-
-# CBLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(atlas, ATL_xerbla,
-	    [AC_CHECK_LIB(cblas, cblas_dgemm,
-	        [acx_cblas_ok=yes
-		 CBLAS_LIBS="-lcblas -latlas"],
-                [], [-latlas])],
-	    [], [-latlas])
-fi
-
-# CBLAS in ATLAS library in /usr/lib64/atlas (if not cross-compiling)
-if test $acx_cblas_ok = no && test "$cross_compiling" = no; then
-	unset ac_cv_lib_atlas_ATL_xerbla
-	unset ac_cv_lib_cblas_cblas_dgemm
-	AC_CHECK_LIB(atlas, ATL_xerbla,
-	    [AC_CHECK_LIB(cblas, cblas_dgemm,
-	        [acx_cblas_ok=yes
-		 CBLAS_LIBS="-L/usr/lib64/atlas -lcblas -latlas"],
-                [], [-L/usr/lib64/atlas -latlas])],
-	    [], [-L/usr/lib64/atlas -latlas])
-fi
-
-# CBLAS in ATLAS library in /usr/lib/atlas (if not cross-compiling)
-if test $acx_cblas_ok = no && test "$cross_compiling" = no; then
-	unset ac_cv_lib_atlas_ATL_xerbla
-	unset ac_cv_lib_cblas_cblas_dgemm
-	AC_CHECK_LIB(atlas, ATL_xerbla,
-	    [AC_CHECK_LIB(cblas, cblas_dgemm,
-	        [acx_cblas_ok=yes
-		 CBLAS_LIBS="-L/usr/lib/atlas -lcblas -latlas"],
-                [], [-L/usr/lib/atlas -latlas])],
-	    [], [-L/usr/lib/atlas -latlas])
-fi
-
-
-# CBLAS in PhiPACK libraries? (requires generic BLAS lib, too)
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(cblas, cblas_sgemm,
-		[AC_CHECK_LIB(dgemm, cblas_dgemm,
-		[AC_CHECK_LIB(sgemm, cblas_sgemm,
-			[acx_cblas_ok=yes; CBLAS_LIBS="-lsgemm -ldgemm -lblas"],
-			[], [-lblas])],
-			[], [-lblas])])
-fi
-
-# BLAS in Intel MKL library?
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(mkl, cblas_sgemm, [acx_cblas_ok=yes;CBLAS_LIBS="-lmkl"])
-fi
-
-# CBLAS in Apple vecLib library?
-if test $acx_cblas_ok = no; then
-	save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS"
-	AC_CHECK_FUNC(cblas_sgemm, [acx_cblas_ok=yes;CBLAS_LIBS="-framework vecLib"])
-	LIBS="$save_LIBS"
-fi
-
-# CBLAS in Alpha CXML library?
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(cxml, cblas_sgemm, [acx_cblas_ok=yes;CBLAS_LIBS="-lcxml"])
-fi
-
-# CBLAS in Alpha DXML library? (now called CXML, see above)
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(dxml, cblas_sgemm, [acx_cblas_ok=yes;CBLAS_LIBS="-ldxml"])
-fi
-
-# CBLAS in Sun Performance library?
-if test $acx_cblas_ok = no; then
-	if test "x$GCC" != xyes; then # only works with Sun CC
-		AC_CHECK_LIB(sunmath, acosp,
-			[AC_CHECK_LIB(sunperf, cblas_sgemm,
-        			[CBLAS_LIBS="-xlic_lib=sunperf -lsunmath"
-                                 acx_cblas_ok=yes],[],[-lsunmath])])
-	fi
-fi
-
-# CBLAS in SCSL library?  (SGI/Cray Scientific Library)
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(scs, cblas_sgemm, [acx_cblas_ok=yes; CBLAS_LIBS="-lscs"])
-fi
-
-# CBLAS in SGIMATH library?
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(complib.sgimath, cblas_sgemm,
-		     [acx_cblas_ok=yes; CBLAS_LIBS="-lcomplib.sgimath"])
-fi
-
-# CBLAS in IBM ESSL library? (requires generic CBLAS lib, too)
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(cblas, cblas_sgemm,
-		[AC_CHECK_LIB(essl, cblas_sgemm,
-			[acx_cblas_ok=yes; CBLAS_LIBS="-lessl -lblas"],
-			[], [-lblas $FLIBS])])
-fi
-
-# Generic CBLAS library?
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(cblas, cblas_sgemm, [acx_cblas_ok=yes; CBLAS_LIBS="-lcblas"])
-fi
-
-# Generic BLAS library?
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(blas, cblas_sgemm, [acx_cblas_ok=yes; CBLAS_LIBS="-lblas"])
-fi
-
-# GSL generic CBLAS library?
-if test $acx_cblas_ok = no; then
-	AC_CHECK_LIB(gslcblas, cblas_sgemm, [acx_cblas_ok=yes; CBLAS_LIBS="-lgslcblas"])
-fi
-
-AC_SUBST(CBLAS_LIBS)
-
-LIBS="$acx_cblas_save_LIBS"
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_cblas_ok" = xyes; then
-        ifelse([$1],,AC_DEFINE(HAVE_CBLAS,1,[Define if you have a CBLAS library.]),[$1])
-        :
-else
-        acx_cblas_ok=no
-        $2
-fi
-])dnl ACX_CBLAS
diff --git a/config/acx_pthread.m4 b/config/acx_pthread.m4
deleted file mode 100644
index eb09f5acc..000000000
--- a/config/acx_pthread.m4
+++ /dev/null
@@ -1,275 +0,0 @@
-# ===========================================================================
-#              http://autoconf-archive.cryp.to/acx_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro figures out how to build C programs using POSIX threads. It
-#   sets the PTHREAD_LIBS output variable to the threads library and linker
-#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-#   flags that are needed. (The user can also force certain compiler
-#   flags/libs to be tested by setting these environment variables.)
-#
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise). (This
-#   is necessary on AIX to use the special cc_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also link it with them as well. e.g. you should link with
-#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-#   If you are only building threads programs, you may wish to use these
-#   variables in your default LIBS, CFLAGS, and CC:
-#
-#          LIBS="$PTHREAD_LIBS $LIBS"
-#          CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#          CC="$PTHREAD_CC"
-#
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-#   is not found. If ACTION-IF-FOUND is not specified, the default action
-#   will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or if
-#   you have any other suggestions or comments. This macro was based on work
-#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-#   grateful for the helpful feedback of numerous users.
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Macro Archive. When you make and
-#   distribute a modified version of the Autoconf Macro, you may extend this
-#   special exception to the GPL to apply to your modified version as well.
-
-AC_DEFUN([ACX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_SAVE
-AC_LANG_C
-acx_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test x"$acx_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case "${host_cpu}-${host_os}" in
-        *solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
-
-        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
-        ;;
-esac
-
-if test x"$acx_pthread_ok" = xno; then
-for flag in $acx_pthread_flags; do
-
-        case $flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $flag])
-                PTHREAD_CFLAGS="$flag"
-                ;;
-
-		pthread-config)
-		AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
-		if test x"$acx_pthread_config" = xno; then continue; fi
-		PTHREAD_CFLAGS="`pthread-config --cflags`"
-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-		;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$flag])
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CFLAGS="$CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        AC_TRY_LINK([#include <pthread.h>],
-                    [pthread_t th; pthread_join(th, 0);
-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-                    [acx_pthread_ok=yes])
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test "x$acx_pthread_ok" = xyes; then
-                break;
-        fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$acx_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-	AC_MSG_CHECKING([for joinable pthread attribute])
-	attr_name=unknown
-	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-	    AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
-                        [attr_name=$attr; break])
-	done
-        AC_MSG_RESULT($attr_name)
-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
-                               [Define to necessary symbol if this constant
-                                uses a non-standard name on your system.])
-        fi
-
-        AC_MSG_CHECKING([if more special flags are required for pthreads])
-        flag=no
-        case "${host_cpu}-${host_os}" in
-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
-        esac
-        AC_MSG_RESULT(${flag})
-        if test "x$flag" != xno; then
-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-        fi
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        # More AIX lossage: must compile with xlc_r or cc_r
-	if test x"$GCC" != xyes; then
-          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
-        else
-          PTHREAD_CC=$CC
-	fi
-else
-        PTHREAD_CC="$CC"
-fi
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_CC)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pthread_ok" = xyes; then
-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
-        :
-else
-        acx_pthread_ok=no
-        $2
-fi
-AC_LANG_RESTORE
-])dnl ACX_PTHREAD
diff --git a/config/ax_boost_base.m4 b/config/ax_boost_base.m4
deleted file mode 100644
index f2a7f6e83..000000000
--- a/config/ax_boost_base.m4
+++ /dev/null
@@ -1,334 +0,0 @@
-# ===========================================================================
-#             http://autoconf-archive.cryp.to/ax_boost_base.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_BASE([MINIMUM-VERSION])
-#
-# DESCRIPTION
-#
-#   Test for the Boost C++ libraries of a particular version (or newer)
-#
-#   If no path to the installed boost library is given the macro searchs
-#   under /usr, /usr/local, /opt and /opt/local and evaluates the
-#   $BOOST_ROOT environment variable. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-#   And sets:
-#
-#     HAVE_BOOST
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_BASE],
-[
-AC_REQUIRE([GR_LIB64])
-AC_ARG_WITH([boost],
-    AS_HELP_STRING([--with-boost@<:@=DIR@:>@],
-		   [use boost (default is yes) - it is possible to specify the root directory for boost (optional)]),
-    [
-    if test "$withval" = "no"; then
-        want_boost="no"
-    elif test "$withval" = "yes"; then
-        want_boost="yes"
-        ac_boost_path=""
-    else
-        want_boost="yes"
-        ac_boost_path="$withval"
-    fi
-    ],
-    [want_boost="yes"])
-
-
-AC_ARG_WITH([boost-libdir],
-        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
-		       [Force given directory for boost libraries. Note that this
-		        will overwrite library path detection, so use this parameter
-		        only if default library detection fails and you know exactly
-                        where your boost libraries are located.]),
-        [
-        if test -d $withval
-        then
-                ac_boost_lib_path="$withval"
-        else
-                AC_MSG_ERROR(--with-boost-libdir expected directory name)
-        fi
-        ],
-        [ac_boost_lib_path=""]
-)
-
-if test "x$want_boost" = "xyes"; then
-    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
-    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
-    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
-    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
-    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-        boost_lib_version_req_sub_minor="0"
-        fi
-    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-    AC_MSG_CHECKING(for boost >= $boost_lib_version_req)
-    succeeded=no
-
-    dnl first we check the system location for boost libraries
-    dnl this location ist chosen if boost libraries are installed with the --layout=system option
-    dnl or if you install boost with RPM
-    if test "$ac_boost_path" != ""; then
-	dnl Look first where we think they ought to be, accounting for a possible "64" suffix on lib.
-	dnl If that directory doesn't exist, fall back to the default behavior
-	if test -d "$ac_boost_path/lib${gr_libdir_suffix}"; then
-            BOOST_LDFLAGS="-L$ac_boost_path/lib${gr_libdir_suffix}"
-        else
-            BOOST_LDFLAGS="-L$ac_boost_path/lib"
-        fi
-        BOOST_CPPFLAGS="-I$ac_boost_path/include"
-    else
-        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
-            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-		dnl Look first where we think they ought to be, accounting for a possible "64" suffix on lib.
-		dnl If that directory doesn't exist, fall back to the default behavior
-		if test -d "$ac_boost_path_tmp/lib${gr_libdir_suffix}"; then
-                    BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib${gr_libdir_suffix}"
-		else
-	            BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
-		fi
-                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-                break;
-            fi
-        done
-    fi
-
-    dnl overwrite ld flags if we have required special directory with
-    dnl --with-boost-libdir parameter
-    if test "$ac_boost_lib_path" != ""; then
-       BOOST_LDFLAGS="-L$ac_boost_lib_path"
-    fi
-
-    CPPFLAGS_SAVED="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-    export CPPFLAGS
-
-    LDFLAGS_SAVED="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-    export LDFLAGS
-
-    AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-    @%:@include <boost/version.hpp>
-    ]], [[
-    #if BOOST_VERSION >= $WANT_BOOST_VERSION
-    // Everything is okay
-    #else
-    #  error Boost version is too old
-    #endif
-    ]])],[AC_MSG_RESULT(yes)
-	  succeeded=yes
-	  found_system=yes
-          ],
-         [])
-    AC_LANG_POP([C++])
-    CPPFLAGS="$CPPFLAGS_SAVED"
-    LDFLAGS="$LDFLAGS_SAVED"
-
-
-    dnl if we found no boost with system layout we search for boost libraries
-    dnl built and installed without the --layout=system option
-    if test "$succeeded" != "yes"; then
-        _version=0
-
-        if test "$ac_boost_path" != ""; then
-	    path_list="$ac_boost_path"
-	else
-	    path_list="/usr /usr/local /opt /opt/local"
-	fi
-        for ac_boost_path in $path_list ; do
-	    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-            	for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-		    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's,/include/boost-,,; s,_,.,'`
-                    V_CHECK=`expr $_version_tmp \> $_version`
-                    if test "$V_CHECK" = "1" ; then
-                        _version=$_version_tmp
-                        best_path=$ac_boost_path
-		    fi
-                done
-            fi
-	done
-
-        VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-        BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-
-        if test "$ac_boost_lib_path" = "";  then
-	    dnl Look first where we think they ought to be, accounting for a possible "64" suffix on lib.
-	    dnl If that directory doesn't exist, fall back to the default behavior
-	    if test -d "$best_path/lib${gr_libdir_suffix}"; then
-                BOOST_LDFLAGS="-L$best_path/lib${gr_libdir_suffix}"
-	    else
-                BOOST_LDFLAGS="-L$best_path/lib"
-	    fi
-        fi
-
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        export CPPFLAGS
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        export LDFLAGS
-
-        AC_LANG_PUSH(C++)
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-        @%:@include <boost/version.hpp>
-        ]], [[
-        #if BOOST_VERSION >= $WANT_BOOST_VERSION
-        // Everything is okay
-        #else
-        #  error Boost version is too old
-        #endif
-        ]])],[AC_MSG_RESULT(yes)
-	      succeeded=yes
-              found_system=yes
-              ],
-	     [])
-        AC_LANG_POP([C++])
-        CPPFLAGS="$CPPFLAGS_SAVED"
-        LDFLAGS="$LDFLAGS_SAVED"
-    fi
-
-    if test "$succeeded" != "yes" ; then
-	AC_MSG_RESULT([no])
-        if test "$_version" = "0" ; then
-            AC_MSG_ERROR([[we could not detect the boost libraries (version $boost_lib_version_req_shorten or higher).
-If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>.]])
-        else
-            AC_MSG_ERROR([your boost libraries seem to old (version $_version).])
-        fi
-    else
-        AC_SUBST(BOOST_CPPFLAGS)
-        AC_SUBST(BOOST_LDFLAGS)
-        AC_DEFINE(HAVE_BOOST,1,[Define if the Boost headers are available])
-    fi
-fi
-])
-
-dnl
-dnl Macros used by the boost items that need libraries.
-dnl
-
-dnl $1 is unit name.  E.g., boost_thread
-AC_DEFUN([_AX_BOOST_CHECK_LIB],[
-    _AX_BOOST_CHECK_LIB_($1,HAVE_[]m4_toupper($1),m4_toupper($1)_LIB)
-])
-
-dnl $1 is unit name.  E.g., boost_thread
-dnl $2 is AC_DEFINE name.  E.g., HAVE_BOOST_THREAD
-dnl $3 is lib var name.    E.g., BOOST_THREAD_LIB
-AC_DEFUN([_AX_BOOST_CHECK_LIB_],[
-    AC_LANG_PUSH([C++])
-    AC_DEFINE($2,1,[Define if the $1 library is available])
-    BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-    dnl See if we can find a usable library
-    link_ok="no"
-    if test "$ax_boost_user_lib" != ""; then
-        dnl use what the user supplied 
-        for ax_lib in $ax_boost_user_lib $1-${ax_boost_user_lib}; do
-	    AC_CHECK_LIB($ax_lib, exit,
-                         [$3="-l$ax_lib"; AC_SUBST($3) link_ok="yes"; break])
-        done
-    else
-	dnl Look in BOOSTLIBDIR for possible candidates
-	head=$BOOSTLIBDIR/lib[]$1
-	for f in ${head}*.so* ${head}*.a* ${head}*.dll* ${head}*.dylib; do
-	    dnl echo 1: $f
-	    case $f in
-	      *\**) continue;;
-	    esac
-	    f=`echo $f | sed -e 's,.*/,,' -e 's,^lib,,'`
-	    dnl echo 2: $f
-	    f=`echo $f | sed -e 's,\($1.*\)\.so.*$,\1,' -e 's,\($1.*\)\.a.*$,\1,' -e 's,\($1.*\)\.dll.*$,\1,' -e 's,\($1.*\)\.dylib.*$,\1,'`
-	    dnl echo 3: $f
-
-	    ax_lib=$f
-            AC_CHECK_LIB($ax_lib, exit,
-                        [$3="-l$ax_lib"; AC_SUBST($3) link_ok="yes"; break])
-	done
-    fi		    
-		    		    
-    if test "$link_ok" != "yes"; then
-    	AC_MSG_ERROR([Could not link against lib[$1]!])
-    fi
-    AC_LANG_POP([C++])
-])
-
-
-dnl $1 is unit name.  E.g., boost_thread
-AC_DEFUN([_AX_BOOST_WITH],[
-    _AX_BOOST_WITH_([$1], [m4_bpatsubst($1,_,-)])
-])
-
-dnl $1 is unit name.  E.g., boost_thread
-dnl $2 is hyphenated unit name.  E.g., boost-thread
-AC_DEFUN([_AX_BOOST_WITH_],[
-    AC_ARG_WITH([$2],
-    		AC_HELP_STRING([--with-$2@<:@=special-lib@:>@],
-		               [Use the m4_substr($1,6) library from boost.  It is possible to specify a certain
-		                library to the linker.  E.g., --with-$2=$1-gcc41-mt-1_35]),
-        	[
-	        if test "$withval" = "no"; then
-	            want_boost="no"
-	        elif test "$withval" = "yes"; then
-	            want_boost="yes"
-	            ax_boost_user_lib=""
-	        else
-	            want_boost="yes"
-	            ax_boost_user_lib="$withval"
-	        fi
-	        ],
-	        [want_boost="yes"])
-])
-
-dnl $1 is unit name.  E.g., boost_thread
-dnl $2 is AC_LANG_PROGRAM argument 1
-dnl $3 is AC_LANG_PROGRAM argument 2
-dnl $4 is cv variable name.  E.g., ax_cv_boost_thread
-AC_DEFUN([_AX_BOOST_CHECK_],[
-    _AX_BOOST_WITH([$1])
-    if test "$want_boost" = "yes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_PROG_CXX])
-        CPPFLAGS_SAVED="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        LDFLAGS_SAVED="$LDFLAGS"
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        AC_CACHE_CHECK([whether the boost::m4_substr([$1],6) includes are available], [$4],
-		       [AC_LANG_PUSH([C++])
-                        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$2],[$3])], [[$4]=yes], [[$4]=no])
-                        AC_LANG_POP([C++])
-			])
-	if test "$[$4]" = "yes"; then
-	    _AX_BOOST_CHECK_LIB([$1])
-	fi
-        CPPFLAGS="$CPPFLAGS_SAVED"
-        LDFLAGS="$LDFLAGS_SAVED"
-    fi
-])
-
-dnl $1 is unit name.  E.g., boost_thread
-dnl $2 is AC_LANG_PROGRAM argument 1
-dnl $3 is AC_LANG_PROGRAM argument 2
-AC_DEFUN([_AX_BOOST_CHECK],[
-    _AX_BOOST_CHECK_([$1], [$2], [$3], [ax_cv_$1])
-])
diff --git a/config/ax_boost_date_time.m4 b/config/ax_boost_date_time.m4
deleted file mode 100644
index 7b3f0fe3d..000000000
--- a/config/ax_boost_date_time.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_DATE_TIME
-#
-# DESCRIPTION
-#
-#   Test for date_time library from the Boost C++ libraries.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_DATE_TIME_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_DATE_TIME
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_DATE_TIME],
-[
-    AC_REQUIRE([AX_BOOST_BASE])	
-    _AX_BOOST_CHECK([boost_date_time],
-		    [@%:@include <boost/date_time/gregorian/gregorian_types.hpp>],
-		    [using namespace boost::gregorian; date d(2002,Jan,10); return 0;])
-])
diff --git a/config/ax_boost_filesystem.m4 b/config/ax_boost_filesystem.m4
deleted file mode 100644
index bcb3fa44f..000000000
--- a/config/ax_boost_filesystem.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_FILESYSTEM
-#
-# DESCRIPTION
-#
-#   Test for Filesystem library from the Boost C++ libraries. The macro
-#   requires a preceding call to AX_BOOST_BASE. 
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_FILESYSTEM_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_FILESYSTEM
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_FILESYSTEM],
-[
-    AC_REQUIRE([AX_BOOST_BASE])
-
-    dnl depends on boost_system
-    AC_REQUIRE([AX_BOOST_SYSTEM])
-    axbf_LDFLAGS_SAVED=$LDFLAGS
-    LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LIB"
-
-    _AX_BOOST_CHECK([boost_filesystem],
-		    [@%:@include <boost/filesystem/path.hpp>],
-		    [using namespace boost::filesystem;
-                     path my_path( "foo/bar/data.txt" );
-                     return 0;])
-
-   LDFLAGS=$axbf_LDFLAGS_SAVED
-])
diff --git a/config/ax_boost_iostreams.m4 b/config/ax_boost_iostreams.m4
deleted file mode 100644
index 181b1e752..000000000
--- a/config/ax_boost_iostreams.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_IOSTREAMS
-#
-# DESCRIPTION
-#
-#   Test for IOStreams library from the Boost C++ libraries. The macro
-#   requires a preceding call to AX_BOOST_BASE.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_IOSTREAMS_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_IOSTREAMS
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_IOSTREAMS],
-[
-    AC_REQUIRE([AX_BOOST_BASE])
-    _AX_BOOST_CHECK([boost_iostreams],
-                    [@%:@include <boost/iostreams/filtering_stream.hpp>
-                     @%:@include <boost/range/iterator_range.hpp>],
-                    [std::string  input = "Hello World!";
-                     namespace io = boost::iostreams;
-                     io::filtering_istream  in(boost::make_iterator_range(input));
-                     return 0;])
-
-])
diff --git a/config/ax_boost_program_options.m4 b/config/ax_boost_program_options.m4
deleted file mode 100644
index 3829373be..000000000
--- a/config/ax_boost_program_options.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_PROGRAM_OPTIONS
-#
-# DESCRIPTION
-#
-#   Test for program options library from the Boost C++ libraries. The macro
-#   requires a preceding call to AX_BOOST_BASE.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_PROGRAM_OPTIONS
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
-[
-    AC_REQUIRE([AX_BOOST_BASE])
-    _AX_BOOST_CHECK([boost_program_options],
-                    [@%:@include <boost/program_options.hpp>],
-                    [boost::program_options::options_description generic("Generic options");
-                     return 0;])
-])
diff --git a/config/ax_boost_python.m4 b/config/ax_boost_python.m4
deleted file mode 100644
index 59c86ad0e..000000000
--- a/config/ax_boost_python.m4
+++ /dev/null
@@ -1,92 +0,0 @@
-# ===========================================================================
-#            http://autoconf-archive.cryp.to/ax_boost_python.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_PYTHON
-#
-# DESCRIPTION
-#
-#   This macro checks to see if the Boost.Python library is installed. It
-#   also attempts to guess the currect library name using several attempts.
-#   It tries to build the library name using a user supplied name or suffix
-#   and then just the raw library.
-#
-#   If the library is found, HAVE_BOOST_PYTHON is defined and
-#   BOOST_PYTHON_LIB is set to the name of the library.
-#
-#   This macro calls AC_SUBST(BOOST_PYTHON_LIB).
-#
-#   In order to ensure that the Python headers are specified on the include
-#   path, this macro requires AX_PYTHON to be called.
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Michael Tindal
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Macro Archive. When you make and
-#   distribute a modified version of the Autoconf Macro, you may extend this
-#   special exception to the GPL to apply to your modified version as well.
-
-AC_DEFUN([AX_BOOST_PYTHON],
-[AC_REQUIRE([AX_PYTHON])dnl
-AC_CACHE_CHECK(whether the Boost::Python library is available,
-ac_cv_boost_python,
-[AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- CPPFLAGS_SAVE=$CPPFLAGS
- if test x$PYTHON_INCLUDE_DIR != x; then
-   CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS
- fi
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <boost/python/module.hpp>
- using namespace boost::python;
- BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
-               [[return 0;]])],
-               [ac_cv_boost_python=yes, ac_cv_boost_python=no)
- AC_LANG_RESTORE
- CPPFLAGS=$CPPFLAGS_SAVE]
-])
-if test "$ac_cv_boost_python" = "yes"; then
-  AC_LANG_PUSH([C++])
-  AC_DEFINE(HAVE_BOOST_PYTHON,,[define if the Boost::Python library is available])
-  ax_python_lib=boost_python
-  AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify the boost python library or suffix to use]),
-  [if test "x$with_boost_python" != "xno"; then
-     ax_python_lib=$with_boost_python
-     ax_boost_python_lib=boost_python-$with_boost_python
-   fi])
-  for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python; do
-    AC_CHECK_LIB($ax_lib, exit, [BOOST_PYTHON_LIB=$ax_lib break])
-  done
-  AC_SUBST(BOOST_PYTHON_LIB)
-  AC_LANG_POP([C++])
-fi
-])dnl
diff --git a/config/ax_boost_regex.m4 b/config/ax_boost_regex.m4
deleted file mode 100644
index 32b531369..000000000
--- a/config/ax_boost_regex.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_REGEX
-#
-# DESCRIPTION
-#
-#   Test for Regex library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_REGEX_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_REGEX
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_REGEX],
-[
-    AC_REQUIRE([AX_BOOST_BASE])
-    _AX_BOOST_CHECK([boost_regex],
-	            [@%:@include <boost/regex.hpp>],
-                    [boost::regex r(); return 0;])
-])
diff --git a/config/ax_boost_serialization.m4 b/config/ax_boost_serialization.m4
deleted file mode 100644
index 78c950078..000000000
--- a/config/ax_boost_serialization.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_SERIALIZATION
-#
-# DESCRIPTION
-#
-#   Test for Serialization library from the Boost C++ libraries. The macro
-#   requires a preceding call to AX_BOOST_BASE.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_SERIALIZATION_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_SERIALIZATION
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_SERIALIZATION],
-[
-    AC_REQUIRE([AX_BOOST_BASE])
-    _AX_BOOST_CHECK([boost_serialization],
-		    [@%:@include <fstream>
-                     @%:@include <boost/archive/text_oarchive.hpp>
-                     @%:@include <boost/archive/text_iarchive.hpp>],
-                    [std::ofstream ofs("filename");
-                     boost::archive::text_oarchive oa(ofs);
-                     return 0;])
-])
diff --git a/config/ax_boost_signals.m4 b/config/ax_boost_signals.m4
deleted file mode 100644
index 3c4971748..000000000
--- a/config/ax_boost_signals.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_SIGNALS
-#
-# DESCRIPTION
-#
-#   Test for Signals library from the Boost C++ libraries. The macro
-#   requires a preceding call to AX_BOOST_BASE.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_SIGNALS_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_SIGNALS
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_SIGNALS],
-[
-    AC_REQUIRE([AX_BOOST_BASE])
-    _AX_BOOST_CHECK([boost_signals],
-		    [@%:@include <boost/signal.hpp>],
-                    [boost::signal<void ()> sig; return 0;])
-])
diff --git a/config/ax_boost_system.m4 b/config/ax_boost_system.m4
deleted file mode 100644
index cb73f2577..000000000
--- a/config/ax_boost_system.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-# ===========================================================================
-# started with this: http://autoconf-archive.cryp.to/ax_boost_system.html,
-# virtually nothing left
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_SYSTEM
-#
-# DESCRIPTION
-#
-#   Test for System library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_SYSTEM_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_SYSTEM
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_SYSTEM],
-[
-    AC_REQUIRE([AX_BOOST_BASE])	
-    _AX_BOOST_CHECK([boost_system],
-		    [@%:@include <boost/system/error_code.hpp>],
-		    [boost::system::system_category])
-])
diff --git a/config/ax_boost_test_exec_monitor.m4 b/config/ax_boost_test_exec_monitor.m4
deleted file mode 100644
index 2c30c0b4a..000000000
--- a/config/ax_boost_test_exec_monitor.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_TEST_EXEC_MONITOR
-#
-# DESCRIPTION
-#
-#   Test for Test_Exec_Monitor library from the Boost C++ libraries. The
-#   macro requires a preceding call to AX_BOOST_BASE.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_TEST_EXEC_MONITOR_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_TEST_EXEC_MONITOR
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Dodji Seketeli <dodji@seketeli.org>
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
-[
-    AC_REQUIRE([AX_BOOST_BASE])
-    _AX_BOOST_CHECK([boost_test_exec_monitor],
-		    [@%:@include <boost/test/test_tools.hpp>],
-                    [int i=1 ; BOOST_REQUIRE(i==1); ; return 0;])
-])
diff --git a/config/ax_boost_thread.m4 b/config/ax_boost_thread.m4
deleted file mode 100644
index 8e42510ea..000000000
--- a/config/ax_boost_thread.m4
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_THREAD
-#
-# DESCRIPTION
-#
-#   Test for Thread library from the Boost C++ libraries.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_THREAD_LIB)
-#     AC_SUBST(BOOST_CXXFLAGS)
-#
-#   And sets:
-#
-#     HAVE_BOOST_THREAD
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-
-AC_DEFUN([AX_BOOST_THREAD],
-[
-    AC_REQUIRE([AX_BOOST_BASE])
-    AC_REQUIRE([ACX_PTHREAD])
-    _AX_BOOST_WITH([boost_thread])
-
-    if test "$want_boost" = "yes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_PROG_CXX])
-        AC_REQUIRE([AC_CANONICAL_HOST])
-
-        CPPFLAGS_SAVED="$CPPFLAGS"
-        LDFLAGS_SAVED="$LDFLAGS"
-	CXXFLAGS_SAVED="$CXXFLAGS"
-
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $PTHREAD_LIBS"
-	CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
-
-        AC_CACHE_CHECK([whether the boost::thread includes are available],
-                       [ax_cv_boost_thread],
-        [AC_LANG_PUSH([C++])
-             AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
-                                   [[boost::thread_group thrds;
-                                   return 0;]])],
-                   [ax_cv_boost_thread=yes], [ax_cv_boost_thread=no])
-             AC_LANG_POP([C++])
-        ])
-
-        if test "$ax_cv_boost_thread" = "yes"; then
-	    BOOST_CXXFLAGS="$PTHREAD_CFLAGS"
-            AC_SUBST([BOOST_CXXFLAGS])
-	    _AX_BOOST_CHECK_LIB([boost_thread])
-	    if test "$link_ok" = "yes" && test -n "$PTHREAD_LIBS"; then
-	        BOOST_THREAD_LIB="$BOOST_THREAD_LIB $PTHREAD_LIBS"
-	    fi
-        fi
-
-        CPPFLAGS="$CPPFLAGS_SAVED"
-        LDFLAGS="$LDFLAGS_SAVED"
-	CXXFLAGS="$CXXFLAGS_SAVED"
-    fi
-])
diff --git a/config/ax_boost_unit_test_framework.m4 b/config/ax_boost_unit_test_framework.m4
deleted file mode 100644
index 73affccfd..000000000
--- a/config/ax_boost_unit_test_framework.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_UNIT_TEST_FRAMEWORK
-#
-# DESCRIPTION
-#
-#   Test for Unit_Test_Framework library from the Boost C++ libraries. The
-#   macro requires a preceding call to AX_BOOST_BASE.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_UNIT_TEST_FRAMEWORK
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
-[
-    AC_REQUIRE([AX_BOOST_BASE])
-    _AX_BOOST_CHECK([boost_unit_test_framework],
-		    [@%:@include <boost/test/unit_test.hpp>],
-		    [using boost::unit_test::test_suite;
-                     test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" );
-                     return 0;])
-])
diff --git a/config/ax_boost_wserialization.m4 b/config/ax_boost_wserialization.m4
deleted file mode 100644
index f384988cb..000000000
--- a/config/ax_boost_wserialization.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# SYNOPSIS
-#
-#   AX_BOOST_WSERIALIZATION
-#
-# DESCRIPTION
-#
-#   Test for WSerialization library from the Boost C++ libraries. The macro
-#   requires a preceding call to AX_BOOST_BASE.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_WSERIALIZATION_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_WSERIALIZATION
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Free Software Foundation, Inc.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_WSERIALIZATION],
-[
-    AC_REQUIRE([AX_BOOST_BASE])
-
-    dnl depends on BOOST_SERIALIZATION
-    AC_REQUIRE([AX_BOOST_SERIALIZATION])
-    axbws_LDFLAGS_SAVED=$LDFLAGS
-    LDFLAGS="$LDFLAGS $BOOST_SERIALIZATION_LIB"
-
-    _AX_BOOST_CHECK([boost_wserialization],
-		    [@%:@include <fstream>
-                     @%:@include <boost/archive/text_oarchive.hpp>
-                     @%:@include <boost/archive/text_iarchive.hpp>],
-                    [std::ofstream ofs("filename");
-                     boost::archive::text_oarchive oa(ofs);
-                     return 0;])
-
-    LDFLAGS=$axbf_LDFLAGS_SAVED
-])
diff --git a/config/bnv_have_qt.m4 b/config/bnv_have_qt.m4
deleted file mode 100644
index 1469bfbfd..000000000
--- a/config/bnv_have_qt.m4
+++ /dev/null
@@ -1,404 +0,0 @@
-dnl Available from the GNU Autoconf Macro Archive at:
-dnl http://www.gnu.org/software/ac-archive/htmldoc/bnv_have_qt.html
-dnl
-AC_DEFUN([BNV_HAVE_QT],
-[
-  dnl THANKS! This code includes bug fixes by:
-  dnl Tim McClarren.
-
-  AC_REQUIRE([AC_PROG_CXX])
-  AC_REQUIRE([AC_PATH_X])
-  AC_REQUIRE([AC_PATH_XTRA])
-
-  AC_MSG_CHECKING(for Qt)
-
-  AC_ARG_WITH([Qt-dir],
-    [  --with-Qt-dir=DIR       DIR is equal to \$QTDIR if you have followed the
-                          installation instructions of Trolltech. Header
-                          files are in DIR/include, binary utilities are
-                          in DIR/bin and the library is in DIR/lib])
-  AC_ARG_WITH([Qt-include-dir],
-    [  --with-Qt-include-dir=DIR
-                          Qt header files are in DIR])
-  AC_ARG_WITH([Qt-bin-dir],
-    [  --with-Qt-bin-dir=DIR   Qt utilities such as moc and uic are in DIR])
-  AC_ARG_WITH([Qt-lib-dir],
-    [  --with-Qt-lib-dir=DIR   The Qt library is in DIR])
-  AC_ARG_WITH([Qt-lib],
-    [  --with-Qt-lib=LIB       Use -lLIB to link with the Qt library])
-  if test x"$with_Qt_dir" = x"no" ||
-     test x"$with_Qt_include-dir" = x"no" ||
-     test x"$with_Qt_bin_dir" = x"no" ||
-     test x"$with_Qt_lib_dir" = x"no" ||
-     test x"$with_Qt_lib" = x"no"; then
-    # user disabled Qt. Leave cache alone.
-    have_qt="User disabled Qt."
-  else
-    # "yes" is a bogus option
-    if test x"$with_Qt_dir" = xyes; then
-      with_Qt_dir=
-    fi
-    if test x"$with_Qt_include_dir" = xyes; then
-      with_Qt_include_dir=
-    fi
-    if test x"$with_Qt_bin_dir" = xyes; then
-      with_Qt_bin_dir=
-    fi
-    if test x"$with_Qt_lib_dir" = xyes; then
-      with_Qt_lib_dir=
-    fi
-    if test x"$with_Qt_lib" = xyes; then
-      with_Qt_lib=
-    fi
-    # No Qt unless we discover otherwise
-    have_qt=no
-    # Check whether we are requested to link with a specific version
-    if test x"$with_Qt_lib" != x; then
-      bnv_qt_lib="$with_Qt_lib"
-    fi
-    # Check whether we were supplied with an answer already
-    if test x"$with_Qt_dir" != x; then
-      have_qt=yes
-      bnv_qt_dir="$with_Qt_dir"
-      bnv_qt_include_dir="$with_Qt_dir/include"
-      bnv_qt_bin_dir="$with_Qt_dir/bin"
-      bnv_qt_lib_dir="$with_Qt_dir/lib"
-      # Only search for the lib if the user did not define one already
-      if test x"$bnv_qt_lib" = x; then
-        bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p |
-                     sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`"
-      fi
-      bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-    else
-      # Use cached value or do search, starting with suggestions from
-      # the command line
-      AC_CACHE_VAL(bnv_cv_have_qt,
-      [
-        # We are not given a solution and there is no cached value.
-        bnv_qt_dir=NO
-        bnv_qt_include_dir=NO
-        bnv_qt_lib_dir=NO
-        if test x"$bnv_qt_lib" = x; then
-          bnv_qt_lib=NO
-        fi
-        BNV_PATH_QT_DIRECT
-        if test "$bnv_qt_dir" = NO ||
-           test "$bnv_qt_include_dir" = NO ||
-           test "$bnv_qt_lib_dir" = NO ||
-           test "$bnv_qt_lib" = NO; then
-          # Problem with finding complete Qt.  Cache the known absence of Qt.
-          bnv_cv_have_qt="have_qt=no"
-        else
-          # Record where we found Qt for the cache.
-          bnv_cv_have_qt="have_qt=yes                  \
-                       bnv_qt_dir=$bnv_qt_dir          \
-               bnv_qt_include_dir=$bnv_qt_include_dir  \
-                   bnv_qt_bin_dir=$bnv_qt_bin_dir      \
-                      bnv_qt_LIBS=\"$bnv_qt_LIBS\""
-        fi
-      ])dnl
-      eval "$bnv_cv_have_qt"
-    fi # all $bnv_qt_* are set
-  fi   # $have_qt reflects the system status
-  if test x"$have_qt" = xyes; then
-    QT_CXXFLAGS="-I$bnv_qt_include_dir"
-    QT_DIR="$bnv_qt_dir"
-    QT_LIBS="$bnv_qt_LIBS"
-    # If bnv_qt_dir is defined, utilities are expected to be in the
-    # bin subdirectory
-    if test x"$bnv_qt_dir" != x; then
-        if test -x "$bnv_qt_dir/bin/uic"; then
-          QT_UIC="$bnv_qt_dir/bin/uic"
-        else
-          # Old versions of Qt don't have uic
-          QT_UIC=
-        fi
-      QT_MOC="$bnv_qt_dir/bin/moc"
-    else
-      # Or maybe we are told where to look for the utilities
-      if test x"$bnv_qt_bin_dir" != x; then
-        if test -x "$bnv_qt_bin_dir/uic"; then
-          QT_UIC="$bnv_qt_bin_dir/uic"
-        else
-          # Old versions of Qt don't have uic
-          QT_UIC=
-        fi
-        QT_MOC="$bnv_qt_bin_dir/moc"
-      else
-      # Last possibility is that they are in $PATH
-        QT_UIC="`which uic`"
-        QT_MOC="`which moc`"
-      fi
-    fi
-    # All variables are defined, report the result
-    AC_MSG_RESULT([$have_qt:
-    QT_CXXFLAGS=$QT_CXXFLAGS
-    QT_DIR=$QT_DIR
-    QT_LIBS=$QT_LIBS
-    QT_UIC=$QT_UIC
-    QT_MOC=$QT_MOC])
-  else
-    # Qt was not found
-    QT_CXXFLAGS=
-    QT_DIR=
-    QT_LIBS=
-    QT_UIC=
-    QT_MOC=
-    AC_MSG_RESULT($have_qt)
-  fi
-  AC_SUBST(QT_CXXFLAGS)
-  AC_SUBST(QT_DIR)
-  AC_SUBST(QT_LIBS)
-  AC_SUBST(QT_UIC)
-  AC_SUBST(QT_MOC)
-
-  #### Being paranoid:
-  if test x"$have_qt" = xyes; then
-    AC_MSG_CHECKING(correct functioning of Qt installation)
-    AC_CACHE_VAL(bnv_cv_qt_test_result,
-    [
-      cat > bnv_qt_test.h << EOF
-#include <qobject.h>
-class Test : public QObject
-{
-Q_OBJECT
-public:
-  Test() {}
-  ~Test() {}
-public slots:
-  void receive() {}
-signals:
-  void send();
-};
-EOF
-
-      cat > bnv_qt_main.$ac_ext << EOF
-#include "bnv_qt_test.h"
-#include <qapplication.h>
-int main( int argc, char **argv )
-{
-  QApplication app( argc, argv );
-  Test t;
-  QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) );
-}
-EOF
-
-      bnv_cv_qt_test_result="failure"
-      bnv_try_1="$QT_MOC bnv_qt_test.h -o moc_bnv_qt_test.$ac_ext >/dev/null 2>bnv_qt_test_1.out"
-      AC_TRY_EVAL(bnv_try_1)
-      bnv_err_1=`grep -v '^ *+' bnv_qt_test_1.out | grep -v "^bnv_qt_test.h\$"`
-      if test x"$bnv_err_1" != x; then
-        echo "$bnv_err_1" >&AC_FD_CC
-        echo "configure: could not run $QT_MOC on:" >&AC_FD_CC
-        cat bnv_qt_test.h >&AC_FD_CC
-      else
-        bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_bnv_qt_test.o moc_bnv_qt_test.$ac_ext >/dev/null 2>bnv_qt_test_2.out"
-        AC_TRY_EVAL(bnv_try_2)
-        bnv_err_2=`grep -v '^ *+' bnv_qt_test_2.out | grep -v "^bnv_qt_test.{$ac_ext}\$"`
-        if test x"$bnv_err_2" != x; then
-          echo "$bnv_err_2" >&AC_FD_CC
-          echo "configure: could not compile:" >&AC_FD_CC
-          cat bnv_qt_test.$ac_ext >&AC_FD_CC
-        else
-          bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o bnv_qt_main.o bnv_qt_main.$ac_ext >/dev/null 2>bnv_qt_test_3.out"
-          AC_TRY_EVAL(bnv_try_3)
-          bnv_err_3=`grep -v '^ *+' bnv_qt_test_3.out | grep -v "^bnv_qt_main.{$ac_ext}\$"`
-          if test x"$bnv_err_3" != x; then
-            echo "$bnv_err_3" >&AC_FD_CC
-            echo "configure: could not compile:" >&AC_FD_CC
-            cat bnv_qt_main.$ac_ext >&AC_FD_CC
-          else
-            bnv_try_4="$CXX $QT_LIBS $LIBS -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o >/dev/null 2>bnv_qt_test_4.out"
-            AC_TRY_EVAL(bnv_try_4)
-            bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out`
-            if test x"$bnv_err_4" != x; then
-              echo "$bnv_err_4" >&AC_FD_CC
-            else
-              bnv_cv_qt_test_result="success"
-            fi
-          fi
-        fi
-      fi
-    ])dnl AC_CACHE_VAL bnv_cv_qt_test_result
-    AC_MSG_RESULT([$bnv_cv_qt_test_result]);
-    if test x"$bnv_cv_qt_test_result" = "xfailure"; then
-      # working Qt was not found
-      QT_CXXFLAGS=
-      QT_DIR=
-      QT_LIBS=
-      QT_UIC=
-      QT_MOC=
-      have_qt=no
-      AC_MSG_WARN([Failed to find matching components of a complete
-                  Qt installation. Try using more options,
-                  see ./configure --help.])
-    fi
-
-    rm -f bnv_qt_test.h moc_bnv_qt_test.$ac_ext moc_bnv_qt_test.o \
-          bnv_qt_main.$ac_ext bnv_qt_main.o bnv_qt_main \
-          bnv_qt_test_1.out bnv_qt_test_2.out bnv_qt_test_3.out bnv_qt_test_4.out
-  fi
-])
-
-dnl Internal subroutine of BNV_HAVE_QT
-dnl Set bnv_qt_dir bnv_qt_include_dir bnv_qt_bin_dir bnv_qt_lib_dir bnv_qt_lib
-dnl Copyright 2001 Bastiaan N. Veelo <Bastiaan.N.Veelo@immtek.ntnu.no>
-AC_DEFUN([BNV_PATH_QT_DIRECT],
-[
-  ## Binary utilities ##
-  if test x"$with_Qt_bin_dir" != x; then
-    bnv_qt_bin_dir=$with_Qt_bin_dir
-  fi
-  ## Look for header files ##
-  if test x"$with_Qt_include_dir" != x; then
-    bnv_qt_include_dir="$with_Qt_include_dir"
-  else
-    # The following header file is expected to define QT_VERSION.
-    qt_direct_test_header=qglobal.h
-    # Look for the header file in a standard set of common directories.
-    bnv_include_path_list="
-      /usr/include
-      `ls -dr /usr/include/qt* 2>/dev/null`
-      `ls -dr /usr/lib/qt*/include 2>/dev/null`
-      `ls -dr /usr/local/qt*/include 2>/dev/null`
-      `ls -dr /opt/qt*/include 2>/dev/null`
-    "
-    for bnv_dir in $bnv_include_path_list; do
-      if test -r "$bnv_dir/$qt_direct_test_header"; then
-        bnv_dirs="$bnv_dirs $bnv_dir"
-      fi
-    done
-    # Now look for the newest in this list
-    bnv_prev_ver=0
-    for bnv_dir in $bnv_dirs; do
-      bnv_this_ver=`egrep -w '#define QT_VERSION' $bnv_dir/$qt_direct_test_header | sed s/'#define QT_VERSION'//`
-      if expr $bnv_this_ver '>' $bnv_prev_ver > /dev/null; then
-        bnv_qt_include_dir=$bnv_dir
-        bnv_prev_ver=$bnv_this_ver
-      fi
-    done
-  fi dnl Found header files.
-
-  # Are these headers located in a traditional Trolltech installation?
-  # That would be $bnv_qt_include_dir stripped from its last element:
-  bnv_possible_qt_dir=`dirname $bnv_qt_include_dir`
-  if test -x $bnv_possible_qt_dir/bin/moc &&
-     ls $bnv_possible_qt_dir/lib/libqt* > /dev/null; then
-    # Then the rest is a piece of cake
-    bnv_qt_dir=$bnv_possible_qt_dir
-    bnv_qt_bin_dir="$bnv_qt_dir/bin"
-    bnv_qt_lib_dir="$bnv_qt_dir/lib"
-    # Only look for lib if the user did not supply it already
-    if test x"$bnv_qt_lib" = xNO; then
-      bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p |
-                   sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`"
-    fi
-    bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-  else
-    # There is no valid definition for $QTDIR as Trolltech likes to see it
-    bnv_qt_dir=
-    ## Look for Qt library ##
-    if test x"$with_Qt_lib_dir" != x; then
-      bnv_qt_lib_dir="$with_Qt_lib_dir"
-      # Only look for lib if the user did not supply it already
-      if test x"$bnv_qt_lib" = xNO; then
-        bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p |
-                     sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`"
-      fi
-      bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-    else
-      # Normally, when there is no traditional Trolltech installation,
-      # the library is installed in a place where the linker finds it
-      # automatically.
-      # If the user did not define the library name, try with qt
-      if test x"$bnv_qt_lib" = xNO; then
-        bnv_qt_lib=qt
-      fi
-      qt_direct_test_header=qapplication.h
-      qt_direct_test_main="
-        int argc;
-        char ** argv;
-        QApplication app(argc,argv);
-      "
-      # See if we find the library without any special options.
-      # Don't add top $LIBS permanently yet
-      bnv_save_LIBS="$LIBS"
-      LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-      bnv_qt_LIBS="$LIBS"
-      bnv_save_CXXFLAGS="$CXXFLAGS"
-      CXXFLAGS="-I$bnv_qt_include_dir"
-      AC_TRY_LINK([#include <$qt_direct_test_header>],
-        $qt_direct_test_main,
-      [
-        # Success.
-        # We can link with no special library directory.
-        bnv_qt_lib_dir=
-      ], [
-        # That did not work. Try the multi-threaded version
-        echo "Non-critical error, please neglect the above." >&AC_FD_CC
-        bnv_qt_lib=qt-mt
-        LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-        AC_TRY_LINK([#include <$qt_direct_test_header>],
-          $qt_direct_test_main,
-        [
-          # Success.
-          # We can link with no special library directory.
-          bnv_qt_lib_dir=
-        ], [
-          # That did not work. Try the OpenGL version
-          echo "Non-critical error, please neglect the above." >&AC_FD_CC
-          bnv_qt_lib=qt-gl
-          LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-          AC_TRY_LINK([#include <$qt_direct_test_header>],
-            $qt_direct_test_main,
-          [
-            # Succes.
-            # We can link with no special library directory.
-            bnv_qt_lib_dir=
-          ], [
-            # That did not work. Maybe a library version I don't know about?
-            echo "Non-critical error, please neglect the above." >&AC_FD_CC
-            # Look for some Qt lib in a standard set of common directories.
-            bnv_dir_list="
-              `echo $bnv_qt_includes | sed ss/includess`
-              /lib
-              /usr/lib
-              /usr/local/lib
-              /opt/lib
-              `ls -dr /usr/lib/qt* 2>/dev/null`
-              `ls -dr /usr/local/qt* 2>/dev/null`
-              `ls -dr /opt/qt* 2>/dev/null`
-            "
-            for bnv_dir in $bnv_dir_list; do
-              if ls $bnv_dir/libqt*; then
-                # Gamble that it's the first one...
-                bnv_qt_lib="`ls $bnv_dir/libqt* | sed -n 1p |
-                            sed s@$bnv_dir/lib@@ | sed s/[.].*//`"
-                bnv_qt_lib_dir="$bnv_dir"
-                break
-              fi
-            done
-            # Try with that one
-            LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-            AC_TRY_LINK([#include <$qt_direct_test_header>],
-              $qt_direct_test_main,
-            [
-              # Succes.
-              # We can link with no special library directory.
-              bnv_qt_lib_dir=
-            ], [
-              # Leave bnv_qt_lib_dir defined
-            ])
-          ])
-        ])
-      ])
-      if test x"$bnv_qt_lib_dir" != x; then
-        bnv_qt_LIBS="-l$bnv_qt_lib_dir $LIBS"
-      else
-        bnv_qt_LIBS="$LIBS"
-      fi
-      LIBS="$bnv_save_LIBS"
-      CXXFLAGS="$bnv_save_CXXFLAGS"
-    fi dnl $with_Qt_lib_dir was not given
-  fi dnl Done setting up for non-traditional Trolltech installation
-])
diff --git a/config/cppunit.m4 b/config/cppunit.m4
deleted file mode 100644
index 0991d51ec..000000000
--- a/config/cppunit.m4
+++ /dev/null
@@ -1,80 +0,0 @@
-dnl
-dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([AM_PATH_CPPUNIT],
-[
-
-AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
-            cppunit_config_prefix="$withval", cppunit_config_prefix="")
-AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
-            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
-
-  if test x$cppunit_config_exec_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
-     fi
-  fi
-  if test x$cppunit_config_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
-     fi
-  fi
-
-  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
-  cppunit_version_min=$1
-
-  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
-  no_cppunit=""
-  if test "$CPPUNIT_CONFIG" = "no" ; then
-    no_cppunit=yes
-  else
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-    cppunit_version=`$CPPUNIT_CONFIG --version`
-
-    cppunit_major_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_major_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_version_proper=`expr \
-        $cppunit_major_version \> $cppunit_major_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \> $cppunit_minor_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \= $cppunit_minor_min \& \
-        $cppunit_micro_version \>= $cppunit_micro_min `
-
-    if test "$cppunit_version_proper" = "1" ; then
-      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
-    else
-      AC_MSG_RESULT(no)
-      no_cppunit=yes
-    fi
-  fi
-
-  if test "x$no_cppunit" = x ; then
-     ifelse([$2], , :, [$2])     
-  else
-     CPPUNIT_CFLAGS=""
-     CPPUNIT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(CPPUNIT_CFLAGS)
-  AC_SUBST(CPPUNIT_LIBS)
-])
-
-
-
diff --git a/config/gr_check_createfilemapping.m4 b/config/gr_check_createfilemapping.m4
deleted file mode 100644
index a7e290dd3..000000000
--- a/config/gr_check_createfilemapping.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl
-dnl Copyright 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 AC_DEFUN([GR_CHECK_CREATEFILEMAPPING],
-dnl [
-dnl   AC_CHECK_FUNCS([CreateFileMapping])
-dnl ])
-
-AC_DEFUN([GR_CHECK_CREATEFILEMAPPING],[
-  AC_MSG_CHECKING([for CreateFileMapping function])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <windows.h>
-int main (int argc, char **argv)
-{ 
-    HANDLE handle;
-    int size;
-    char	 	seg_name[[1024]];
-    handle = CreateFileMapping(
-                     INVALID_HANDLE_VALUE,    // use paging file
-                     NULL,                    // default security
-                     PAGE_READWRITE,          // read/write access
-                     0,                       // max. object size
-                     size,                // buffer size
-                     seg_name);                 // name of mapping object
-    return 0;
-}
-])],[HAVE_CREATEFILEMAPPING=yes
-     AC_DEFINE([HAVE_CREATEFILEMAPPING],[1],
-	[Define if you have the CreateFilemapping function(win32).])],
-  [HAVE_CREATEFILEMAPPING=no])
-
-  AC_MSG_RESULT([$HAVE_CREATEFILEMAPPING])
-  AM_CONDITIONAL([HAVE_CREATEFILEMAPPING], [test x$HAVE_CREATEFILEMAPPING = xyes])
-])
-
-
diff --git a/config/gr_check_mc4020.m4 b/config/gr_check_mc4020.m4
deleted file mode 100644
index 28987c26b..000000000
--- a/config/gr_check_mc4020.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-dnl
-dnl Copyright 2003 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 
-
-AC_DEFUN([GR_CHECK_MC4020],[
-  AC_MSG_CHECKING([for mc4020 A/D driver include file])
-  AC_COMPILE_IFELSE([
-#include <mc4020.h>
-int main (int argc, char **argv)
-{ 
-    return 0;
-}
-],[HAVE_MC4020=yes
-   AC_DEFINE(HAVE_MC4020,[1],[Define if you have a Measurement Computing PCI-DAS4020/12 A/D])],
-  [HAVE_MC4020=no])
-
-  AC_MSG_RESULT($HAVE_MC4020)
-  AM_CONDITIONAL(HAVE_MC4020,     test x$HAVE_MC4020 = xyes)
-])
-
diff --git a/config/gr_check_memalign.m4 b/config/gr_check_memalign.m4
deleted file mode 100644
index 109516aa3..000000000
--- a/config/gr_check_memalign.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2008 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Boston, MA
-# 02110-1301, USA.
-
-AC_DEFUN([GR_CHECK_MEMALIGN],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-
-  # Check for allocing memory alignment functions
-  # If 'posix_memalign' is available, use it solely.
-  AC_CHECK_FUNCS([posix_memalign],,[
-    # Otherwise, check for valloc and the
-    # (a-priori known) alignment of 'malloc'
-    AC_CHECK_FUNCS([valloc])
-    aligned_malloc=0
-    # 'malloc' is 16-byte aligned on (at least) Darwin 8 and 9
-    case "$host_os" in
-      darwin8*) aligned_malloc=16 ;;
-      darwin9*) aligned_malloc=16 ;;
-      *) ;;
-    esac
-    if test $aligned_malloc = 0; then
-      AC_MSG_RESULT([malloc has unknown alignment.])
-    else
-      AC_MSG_RESULT([malloc is $aligned_malloc-byte aligned.])
-    fi
-    AC_DEFINE_UNQUOTED([ALIGNED_MALLOC],[$aligned_malloc],[Define as the alignment of malloc if known; otherwise 0.])
-  ])
-])
diff --git a/config/gr_check_shm_open.m4 b/config/gr_check_shm_open.m4
deleted file mode 100644
index 83d260b9b..000000000
--- a/config/gr_check_shm_open.m4
+++ /dev/null
@@ -1,29 +0,0 @@
-dnl
-dnl Copyright 2003 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([GR_CHECK_SHM_OPEN],
-[
-  SHM_OPEN_LIBS=""
-  save_LIBS="$LIBS"
-  AC_SEARCH_LIBS([shm_open], [rt], [SHM_OPEN_LIBS="$LIBS"])
-  AC_CHECK_FUNCS([shm_open])
-  LIBS="$save_LIBS"
-  AC_SUBST(SHM_OPEN_LIBS)
-])
diff --git a/config/gr_check_usrp.m4 b/config/gr_check_usrp.m4
deleted file mode 100644
index 12a5d1c05..000000000
--- a/config/gr_check_usrp.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl
-dnl Copyright 2003 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 
-
-dnl Check for Universal Software Radio Peripheral
-
-AC_DEFUN([GR_CHECK_USRP],[
-  PKG_CHECK_MODULES(USRP, usrp >= 0.2,
-	[HAVE_USRP=yes
-	   AC_DEFINE(HAVE_USRP,[1],[Define if you have a USRP])],
-	[HAVE_USRP=no])
-
-  AM_CONDITIONAL(HAVE_USRP,     test x$HAVE_USRP = xyes)
-])
-
diff --git a/config/gr_doxygen.m4 b/config/gr_doxygen.m4
deleted file mode 100644
index ca9344313..000000000
--- a/config/gr_doxygen.m4
+++ /dev/null
@@ -1,60 +0,0 @@
-dnl
-dnl Copyright 2003,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 
-
-AC_DEFUN([GR_CHECK_DOXYGEN],[
-  AC_ARG_ENABLE(doxygen,
-		AC_HELP_STRING([--enable-doxygen],
-			       [enable documentation generation with doxygen (auto)]))
-  AC_ARG_ENABLE(dot, AC_HELP_STRING([--enable-dot],[use 'dot' to generate graphs in doxygen (auto)]))
-
-  if test "x$enable_doxygen" = xno; then
-        enable_doc=no
-  else
-        AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
-        if test x$DOXYGEN = x; then
-                if test "x$enable_doxygen" = xyes; then
-                        AC_MSG_ERROR([could not find doxygen])
-                fi
-                enable_doc=no
-		generate_docs=
-        else
-                enable_doc=yes
-		generate_docs=docs
-                AC_PATH_PROG(DOT, dot, , $PATH)
-        fi
-  fi
-
-  AM_CONDITIONAL(DOC, test x$enable_doc = xyes)
-
-  if test x$DOT = x; then
-        if test "x$enable_dot" = xyes; then
-                AC_MSG_ERROR([could not find dot])
-        fi
-        enable_dot=no
-  else
-        enable_dot=yes
-  fi
-  AC_SUBST(enable_dot)
-  AC_SUBST(enable_xml_docs, YES)
-  AC_SUBST(enable_html_docs, YES)
-  AC_SUBST(enable_latex_docs, NO)
-  AC_SUBST(generate_docs)
-])
diff --git a/config/gr_fortran.m4 b/config/gr_fortran.m4
deleted file mode 100644
index 031052043..000000000
--- a/config/gr_fortran.m4
+++ /dev/null
@@ -1,33 +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 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([GR_FORTRAN],[
-    dnl if you want to generate a different table of interpolator taps, you need fortran.
-    dnl we default to off, since almost no one wants to do this.
-    AC_ARG_ENABLE(fortran, AC_HELP_STRING([--enable-fortran],[enable fortran (no)]),
-		  [], [enable_fortran=no])
-    AM_CONDITIONAL(ENABLE_FORTRAN, test "x$enable_fortran" = xyes)
-
-    if test "x$enable_fortran" = xyes
-    then
-        AC_PROG_F77
-        AC_F77_LIBRARY_LDFLAGS
-    fi
-    AC_PROG_CC dnl bux fix to restore $ac_ext
-])
diff --git a/config/gr_git.m4 b/config/gr_git.m4
deleted file mode 100644
index c4f1ea0c0..000000000
--- a/config/gr_git.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl Copyright 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([GR_GIT],[
-  dnl Identify git binary
-  AC_PATH_PROG([GIT],[git])
-  
-  dnl If it exists, get either 'git describe' or fallback to current commit
-  if test x$GIT != x ; then
-    AC_MSG_CHECKING([existence of git version control directory])
-    if test -d $srcdir/.git ; then
-      AC_MSG_RESULT([ok])
-      AC_MSG_CHECKING([git description of current commit])
-      if (cd $srcdir && $GIT describe >/dev/null 2>&1); then
-        GIT_DESCRIBE=`cd $srcdir && $GIT describe --abbrev=8 --long`
-        # Release candidate tags create an extra -rcX field
-	case $GIT_DESCRIBE in
-	  *-*-*-*)
-	    GIT_TAG=`echo $GIT_DESCRIBE | cut -f -2 -d '-'`
-	    GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 3 -d '-'`
-	    GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 4 -d '-' | cut -f 2- -d 'g'`
-	    ;;
-	  *-*-*)
-	    GIT_TAG=`echo $GIT_DESCRIBE | cut -f 1 -d '-'`
- 	    GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 2 -d '-'`
-	    GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 3 -d '-' | cut -f 2- -d 'g'`
-	    ;;
-	esac
-
-	AC_MSG_RESULT([$GIT_DESCRIBE])
-      else
-        AC_MSG_RESULT([no tag in history, using current commit])
-	GIT_TAG=''
-	GIT_SEQNO=''
-	GIT_COMMIT=`cd $srcdir && $GIT describe --always --abbrev=8`
-      fi
-    else
-      AC_MSG_RESULT([not found])
-    fi
-
-    AC_SUBST([GIT_DESCRIBE])
-    AC_SUBST([GIT_TAG])
-    AC_SUBST([GIT_SEQNO])
-    AC_SUBST([GIT_COMMIT])
-  fi
-])
diff --git a/config/gr_gprof.m4 b/config/gr_gprof.m4
deleted file mode 100644
index 20bacf363..000000000
--- a/config/gr_gprof.m4
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Copyright 2002 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 
-
-dnl FIXME probably need to add linker flag too...
-
-AC_DEFUN([GR_SET_GPROF],[
-  dnl Check for --with-gprof
-  AC_MSG_CHECKING([whether user wants gprof])
-  AC_ARG_WITH(gprof,
-              [  --with-gprof            Turn on gprof profiling],
-              [], [ with_gprof=no ])
-  AC_MSG_RESULT($with_gprof)
-  
-  dnl gprof profiling flags for the two main compilers
-  cc_profiling_flags="-pg"
-  cxx_profiling_flags="-pg"
-  ld_profiling_flags="-pg"
-  if test $with_gprof = yes
-  then
-    if test -n "${CC}"
-    then
-      LF_CHECK_CC_FLAG($cc_profiling_flags)
-    fi
-    if test -n "${CXX}" 
-    then
-      LF_CHECK_CXX_FLAG($cxx_profiling_flags)
-    fi
-  fi
-])
-
-AC_DEFUN([GR_SET_PROF],[
-  dnl Check for --with-prof
-  AC_MSG_CHECKING([whether user wants prof])
-  AC_ARG_WITH(prof,
-              [  --with-prof             Turn on prof profiling],
-              [], [ with_prof=no ])
-  AC_MSG_RESULT($with_prof)
-  
-  dnl prof profiling flags for the two main compilers
-  cc_profiling_flags="-p"
-  cxx_profiling_flags="-p"
-  ld_profiling_flags="-p"
-  if test $with_prof = yes
-  then
-    if test -n "${CC}"
-    then
-      LF_CHECK_CC_FLAG($cc_profiling_flags)
-    fi
-    if test -n "${CXX}" 
-    then
-      LF_CHECK_CXX_FLAG($cxx_profiling_flags)
-    fi
-  fi
-])
diff --git a/config/gr_guile.m4 b/config/gr_guile.m4
deleted file mode 100644
index b5879e081..000000000
--- a/config/gr_guile.m4
+++ /dev/null
@@ -1,76 +0,0 @@
-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
-      dnl Only break on an error if we are using guile.
-      dnl This should be taken care of in gr_scripting.m4 and I don't know why it's not.
-      if test x${enable_guile} = xyes; then
-         AC_MSG_ERROR([You need to install the guile development files (e.g., libguile-dev, guile-devel, etc.)!])
-      fi
-      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_lib64.m4 b/config/gr_lib64.m4
deleted file mode 100644
index 92f1bd917..000000000
--- a/config/gr_lib64.m4
+++ /dev/null
@@ -1,85 +0,0 @@
-dnl
-dnl Copyright 2005,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
-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 
-
-dnl GR_LIB64()
-dnl
-dnl Checks to see if we're on a x86_64 or powerpc64 machine, and if so, determine
-dnl if libdir should end in "64" or not.
-dnl
-dnl Sets gr_libdir_suffix to "" or "64" and calls AC_SUBST(gr_libdir_suffix)
-dnl May append "64" to libdir.
-dnl
-dnl The current heuristic is:
-dnl   if the host_cpu isn't x86_64 or powerpc64, then ""
-dnl   if the host_os isn't linux, then ""
-dnl   if we're cross-compiling, ask the linker, by way of the selected compiler
-dnl   if we're x86_64 and there's a /lib64 and it's not a symlink, then "64", else ""
-dnl   else ask the compiler
-dnl
-AC_DEFUN([GR_LIB64],[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_PROG_CXX])
-
-  AC_MSG_CHECKING([gr_libdir_suffix])
-  gr_libdir_suffix=""
-  AC_SUBST([gr_libdir_suffix])
-
-  case "$host_os" in
-    linux*) is_linux=yes ;;
-    *)      is_linux=no  ;;
-  esac
-
-  if test "$is_linux" = no || test "$host_cpu" != "x86_64" && test "$host_cpu" != "powerpc64"; then
-    gr_libdir_suffix=""
-  elif test "$cross_compiling" = yes; then
-    _GR_LIB64_ASK_COMPILER
-  elif test "$host_cpu" = "x86_64"; then
-    if test -d /lib64 && test ! -L /lib64; then
-      gr_libdir_suffix=64
-    fi
-  else
-    _GR_LIB64_ASK_COMPILER  
-  fi
-  AC_MSG_RESULT([$gr_libdir_suffix])
-
-
-  AC_MSG_CHECKING([whether to append 64 to libdir])
-  t=${libdir##*/lib}
-  if test "$t" != 64 && test "$gr_libdir_suffix" = "64"; then
-    libdir=${libdir}64
-    AC_MSG_RESULT([yes. Setting libdir to $libdir])
-  else
-    AC_MSG_RESULT([no])
-  fi
-])
-
-dnl If we're using g++, extract the first SEARCH_DIR("...") entry from the linker script
-dnl and see if it contains a suffix after the final .../lib part of the path.
-dnl (This works because the linker script varies depending on whether we're generating
-dnl 32-bit or 64-bit executables)
-dnl
-AC_DEFUN([_GR_LIB64_ASK_COMPILER],[
-  if test "$ac_cv_cxx_compiler_gnu" = "yes";
-  then
-    gr_libdir_suffix=`$CXX -Wl,--verbose 2>/dev/null | sed -n -e '/SEARCH_DIR/{s/;.*$//; s,^.*/,,; s/".*$//; s/^lib//; p}'`
-  fi
-])
-
diff --git a/config/gr_libgnuradio_core_extra_ldflags.m4 b/config/gr_libgnuradio_core_extra_ldflags.m4
deleted file mode 100644
index 43f872c04..000000000
--- a/config/gr_libgnuradio_core_extra_ldflags.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-# Check for (MinGW)win32 extra ld options.             -*- Autoconf -*-
-
-# Copyright 2003,2004,2005 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-dnl
-AC_DEFUN([GR_LIBGNURADIO_CORE_EXTRA_LDFLAGS], [
-AC_REQUIRE([AC_PROG_LD])
-# on Mingw32 extra LDFLAGS are required to ease global variable linking
-LIBGNURADIO_CORE_EXTRA_LDFLAGS=""
-
-AC_MSG_CHECKING([whether $LD accepts --enable-runtime-pseudo-reloc])
-if ${LD} --enable-runtime-pseudo-reloc --version >/dev/null 2>&1
-then
-        # libtool requires the quotes
-        LIBGNURADIO_CORE_EXTRA_LDFLAGS="\"-Wl,--enable-runtime-pseudo-reloc\""
-        AC_MSG_RESULT(yes)
-else
-        AC_MSG_RESULT(no)
-fi
-
-AC_SUBST(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
-
-])
diff --git a/config/gr_no_undefined.m4 b/config/gr_no_undefined.m4
deleted file mode 100644
index c8d745d5f..000000000
--- a/config/gr_no_undefined.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl
-dnl Copyright 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 
-
-# GR_NO_UNDEFINED()
-#
-# Detemine whether we need to use the -no-undefined linker flag
-# when building shared libraries.  
-# Sets NO_UNDEFINED to "" or "-no-undefined"
-# 
-# As far as I can tell, we need -no-undefined only when building
-# windows DLLs.  This occurs when using MinGW and Cygwin.
-#
-# For now, we stub this out.
-
-AC_DEFUN([GR_NO_UNDEFINED],[
-	AC_REQUIRE([AC_CANONICAL_HOST])
-	no_undefined=""
-	case "${host_os}" in
-		*mingw* | *cygwin*)
-
-		# on MinGW/Cygwin extra LDFLAGS are required
-		no_undefined="-no-undefined"
-		;;
-	esac
-	AC_SUBST(NO_UNDEFINED,[$no_undefined])
-])
diff --git a/config/gr_pwin32.m4 b/config/gr_pwin32.m4
deleted file mode 100644
index 6b27b439f..000000000
--- a/config/gr_pwin32.m4
+++ /dev/null
@@ -1,138 +0,0 @@
-# Check for (mingw)win32 POSIX replacements.             -*- Autoconf -*-
-
-# Copyright 2003,2004,2005,2011 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-
-AC_DEFUN([GR_PWIN32],
-[
-AC_REQUIRE([AC_HEADER_TIME])
-AC_CHECK_HEADERS([sys/types.h fcntl.h io.h])
-AC_CHECK_HEADERS([windows.h])
-AC_CHECK_HEADERS([winioctl.h winbase.h], [], [], [
-	#if HAVE_WINDOWS_H
-	#include <windows.h>
-	#endif
-])
-
-AC_CHECK_FUNCS([getopt usleep gettimeofday nanosleep rand srand random srandom sleep sigaction])
-AC_CHECK_TYPES([struct timezone, struct timespec, ssize_t],[],[],[
-     #if HAVE_SYS_TYPES_H
-     # include <sys/types.h>
-     #endif
-     #if TIME_WITH_SYS_TIME
-     # include <sys/time.h>
-     # include <time.h>
-     #else
-     # if HAVE_SYS_TIME_H
-     #  include <sys/time.h>
-     # else
-     #  include <time.h>
-     # endif
-     #endif
-])
-
-dnl Checks for replacements
-AC_REPLACE_FUNCS([getopt usleep gettimeofday])
-
-
-AC_MSG_CHECKING(for Sleep)
-AC_TRY_LINK([   #include <windows.h>
-                #include <winbase.h>
-                ], [ Sleep(0); ],
-                [AC_DEFINE(HAVE_SSLEEP,1,[Define to 1 if you have win32 Sleep])
-                AC_MSG_RESULT(yes)],
-                AC_MSG_RESULT(no)
-                )
-
-AH_BOTTOM(
-[
-/* Define missing prototypes, implemented in replacement lib */
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifndef HAVE_GETOPT
-int getopt (int argc, char * const argv[], const char * optstring);
-extern char * optarg;
-extern int optind, opterr, optopt;
-#endif
-
-#ifndef HAVE_USLEEP
-int usleep(unsigned long usec);	/* SUSv2 */
-#endif
-
-#ifndef HAVE_NANOSLEEP
-#ifndef HAVE_STRUCT_TIMESPEC
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>	/* need time_t */
-#endif
-struct timespec {
-	time_t	tv_sec;
-	long	tv_nsec;
-};
-#endif
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-static inline int nanosleep(const struct timespec *req, struct timespec *rem) { return usleep(req->tv_sec*1000000+req->tv_nsec/1000); }
-#endif
-
-#if defined(HAVE_SSLEEP) && !defined(HAVE_SLEEP)
-#ifdef HAVE_WINBASE_H
-#include <windows.h>
-#include <winbase.h>
-#endif
-/* TODO: what about SleepEx? */
-static inline unsigned int sleep (unsigned int nb_sec) { Sleep(nb_sec*1000); return 0; }
-#endif
-
-#ifndef HAVE_GETTIMEOFDAY
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifndef HAVE_STRUCT_TIMEZONE
-struct timezone {
-        int  tz_minuteswest;
-	int  tz_dsttime;
-};
-#endif
-int gettimeofday(struct timeval *tv, struct timezone *tz);
-#endif
-
-#if !defined(HAVE_RANDOM) && defined(HAVE_RAND)
-#include <stdlib.h>
-static inline long int random (void) { return rand(); }
-#endif
-
-#if !defined(HAVE_SRANDOM) && defined(HAVE_SRAND)
-static inline void srandom (unsigned int seed) { srand(seed); }
-#endif
-
-#ifndef HAVE_SSIZE_T
-typedef size_t ssize_t;
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-])
-
-
-])
diff --git a/config/gr_python.m4 b/config/gr_python.m4
deleted file mode 100644
index d89f4c504..000000000
--- a/config/gr_python.m4
+++ /dev/null
@@ -1,190 +0,0 @@
-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 
-
-# PYTHON_DEVEL()
-#
-# Checks for Python and tries to get the include path to 'Python.h'.
-# It sets the $(PYTHON_CPPFLAGS), $(PYTHON_LDFLAGS) and $(pythondir) output variables,
-#
-AC_DEFUN([PYTHON_DEVEL],[
-	AC_REQUIRE([AM_PATH_PYTHON])
-	AC_REQUIRE([AC_CANONICAL_HOST])
-
-	AC_ARG_WITH(pythondir,
-                    AC_HELP_STRING([--with-pythondir=DIR], 
-                       [python installation directory (cross-compiling) [[default=$prefix/lib/python2.5/site-packages]]]),
-		    [with_pythondir=${withval}],[with_pythondir=${prefix}/lib/python2.5/site-packages])
-
-	# if we're cross-compiling, asking the host python about any of
-	# this is completely useless...
-
-	if test x$cross_compiling != xno
-	then
-		pythondir=$with_pythondir
-		pyexecdir=$with_pythondir
-		AC_SUBST(PYTHON_CPPFLAGS)
-		AC_SUBST(PYTHON_LDFLAGS)
-        else
-
-	    # For Fedora Core 5 and 6, see ticket:39 in Trac
-	    if test -f '/etc/redhat-release'; then
-		    if  (echo $pyexecdir | grep -q lib64); then
-			    pythondir="$pyexecdir"
-		    fi
-	    else
-		# Let Python tell us where the install directory is;
-		# i.e., don't trust AM_PATH_PYTHON
-		python_cmd='
-import distutils.sysconfig
-import os
-path = distutils.sysconfig.get_python_lib()
-pypath = distutils.sysconfig.get_config_var("exec_prefix")
-path = path.split(pypath)[[1]]
-if os.sep == "\\":
-  path = path.replace("\\", "/")
-print path
-'
-		pyexecdir=$prefix`$PYTHON -c "$python_cmd"`
-		pythondir=$pyexecdir
-		
-	    fi
-
-	    # Check for Python include path
-	    AC_MSG_CHECKING([for Python include path])
-	    if test -z "$PYTHON" ; then
-		    AC_MSG_ERROR([cannot find Python path])
-	    fi
-
-	    # ask distutils which include path we should use
-	    python_cmd='
-import distutils.sysconfig
-import os
-path = distutils.sysconfig.get_python_inc(plat_specific=False)
-if os.sep == "\\":
-  path = path.replace("\\", "/")
-print path
-'
-	    python_path=`$PYTHON -c "$python_cmd"`
-	    AC_MSG_RESULT([$python_path])
-	    if test -z "$python_path" ; then
-		    AC_MSG_ERROR([cannot find Python include path])
-	    fi
-
-	    AC_SUBST(PYTHON_CPPFLAGS,[-I$python_path])
-
-	    # Check for Python headers usability
-	    python_save_CPPFLAGS=$CPPFLAGS
-	    CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
-	    AC_CHECK_HEADERS([Python.h], [],
-			    [AC_MSG_ERROR([cannot find usable Python headers])])
-	    CPPFLAGS="$python_save_CPPFLAGS"
-
-	    # Only set this on mingw and cygwin hosts, (only implemented
-	    # for mingw host, for crosscompiling you need to trick this)
-
-	    PYTHON_LDFLAGS=""
-	    case $host_os in
-		 *mingw* | *cygwin* )
-	      AC_MSG_CHECKING([for Python LDFLAGS])
-
-	    python_cmd='
-import distutils.sysconfig
-import os
-path = distutils.sysconfig.get_config_var("LIBPL")
-if path == None:
-  path = distutils.sysconfig.PREFIX + "/libs"
-if os.sep == "\\":
-  path = path.replace("\\", "/")
-print path
-'
-	      python_stdlib_path=`$PYTHON -c "$python_cmd"`
-
-	      python_version_nodot=`echo $PYTHON_VERSION | sed "s,\.,,"`
-	      libpython_name="python$PYTHON_VERSION"
-
-	      # Standard install of python for win32 has libpython24.a
-	      # instead of libpython2.4.a so we check for the library
-	      # without the dot in the version number.
-
-	      python_stdlib_filename=`find $python_stdlib_path -type f -name libpython$python_version_nodot.* -print | sed "1q"`
-	      if test -n "$python_stdlib_filename" ; then
-		    libpython_name="python$python_version_nodot"
-	      fi
-
-	      PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name"
-	      AC_MSG_RESULT($PYTHON_LDFLAGS) 
-	      # Replace all backslashes in PYTHON Paths with forward slashes
-	      pythondir=`echo $pythondir |sed 's,\\\\,/,g'`
-	      pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'`
-	      pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'`
-	      pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'`
-	      ;;
-	    esac
-
-	    case $host_os in
-		 *mingw* )
-	      # Python 2.5 requires ".pyd" instead of ".dll" for extensions
-	      PYTHON_LDFLAGS="-shrext .pyd ${PYTHON_LDFLAGS}"
-	    esac
-
-	    AC_SUBST(PYTHON_LDFLAGS)
-	fi
-])
-
-# PYTHON_CHECK_MODULE
-#
-# Determines if a particular Python module can be imported
-#
-# $1 - module name
-# $2 - module description
-# $3 - action if found
-# $4 - action if not found
-# $5 - test command
-
-AC_DEFUN([PYTHON_CHECK_MODULE],[
-    AC_MSG_CHECKING([for $2])
-    dnl ########################################
-    dnl # import and test checking
-    dnl ########################################
-    if test "$5"; then
-        python_cmd='
-try:
-    import $1
-    assert $5
-except ImportError, AssertionError: exit(1)
-except: pass'
-    dnl ########################################
-    dnl # import checking only
-    dnl ########################################
-    else
-        python_cmd='
-try: import $1
-except ImportError: exit(1)
-except: pass'
-    fi
-    if ! $PYTHON -c "$python_cmd" 2> /dev/null; then
-        AC_MSG_RESULT([no])
-        $4
-    else
-        AC_MSG_RESULT([yes])
-        $3
-    fi
-])
diff --git a/config/gr_qwt.m4 b/config/gr_qwt.m4
deleted file mode 100644
index 035e94091..000000000
--- a/config/gr_qwt.m4
+++ /dev/null
@@ -1,152 +0,0 @@
-dnl
-dnl Copyright 2007,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
-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
-
-dnl Configure paths for library qwt.
-dnl
-dnl GR_QWT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-dnl Test for library qwt, set QWT_CFLAGS and QWT_LIBS if found. Assumes 
-dnl QT_CFLAGS and QT_LIBS have already been correctly set.
-dnl
-
-AC_DEFUN([GR_QWT],
-[
-    dnl QWT Library Version
-    QWT_LIBRARY1=-lqwt-qt4
-    QWT_LIBRARY2=-lqwt
-
-    dnl Save the environment
-    AC_LANG_PUSH(C++)
-    qwt_save_CPPFLAGS="$CPPFLAGS"
-    qwt_save_LIBS="$LIBS"
-    libqwt_ok=yes
-
-    dnl QWT Info
-    dnl Allow user to specify where QWT files are
-    AC_ARG_WITH([qwt-libdir],
-		[  --with-qwt-libdir=path  Prefix where QWT library is installed (optional)],
-		[qwt_libdir="$withval"], [qwt_libdir=""])
-
-    AC_ARG_WITH([qwt-incdir],
-		[  --with-qwt-incdir=path  Prefix where QWT include files are (optional)],
-		[qwt_incdir="$withval"], [qwt_incdir=""])
-    AC_ARG_WITH([qwt-lib],
-		[  --with-qwt-lib=library  QWT library name (optional)],
-		[qwt_lib="$withval"], [qwt_lib=""])
-
-    dnl Check for presence of header files
-    dnl if not user-specified, try the first include dir (Ubuntu), then
-    dnl try the second include dir (Fedora)
-    CPPFLAGS="$CPPFLAGS $QTCORE_CFLAGS"
-
-    dnl if not set by user
-    if test "$qwt_incdir" = "" ; then
-        dnl check qwt-qt4/qwt.h (as in Ubuntu)
-        AC_CHECK_HEADER(
-            [qwt-qt4/qwt_math.h],
-            [qwt_qt4_qwt_h=yes],
-            [qwt_qt4_qwt_h=no]
-        )
-        dnl If it was found, set the flags and move on
-        if test "$qwt_qt4_qwt_h" = "yes" ; then
-            QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4"
-        else
-            dnl check qwt/qwt.h (as in Fedora)
-            AC_CHECK_HEADER(
-                [qwt/qwt_math.h],
-	        [qwt_qwt_h=yes],
-                [qwt_qwt_h=no]
-            )
-            dnl if it was found, set the flags and move on
-            if test "$qwt_qwt_h" = "yes" ; then
-                QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt"
-            else
-                dnl otherwise, qwt.h wasn't found, so set the flag to no
-                libqwt_ok=no
-            fi
-        fi
-    else
-	dnl Using the user-specified include directory
-	QWT_CFLAGS="$QWT_CFLAGS -I$qwt_incdir"
-        AC_CHECK_HEADER(
-            [$qwt_incdir/qwt.h],
-	    [],
-	    [libqwt_ok=no])
-    fi
-
-    dnl Don't bother going on if we can't find the headers
-    if test "$libqwt_ok" = "yes" ; then
-
-        dnl Check for QWT library (qwt or qwt-qt4)
-
-        dnl User-defined QWT library path
-        if test "$qwt_libdir" != "" ; then
-            QWT_LIBS="-L$qwt_libdir $QWT_LIBS"
-        fi
-
-        dnl temporarily set these so the AC_CHECK_LIB works
-        CPPFLAGS="$CPPFLAGS $QWT_CFLAGS"
-        LIBS="$qwt_save_LIBS $QT_LIBS $QWT_LIBS -lqwt"
-
-        dnl If the user specified a qwt library name, use it here
-        if test "$qwt_lib" != "" ; then
-            AC_CHECK_LIB([$qwt_lib], [main], [libqwt_ok=yes], [libqwt_ok=no])
-
-        else            
-            dnl Check for 'main' in libqwt (Fedora)
-            AC_CHECK_LIB([qwt], [main], [libqwt_ok=yes], [libqwt_ok=no])
-
-            dnl If library found properly, set the flag and move on
-            if test "$libqwt_ok" = "yes" ; then
-                QWT_LIBS="$QWT_LIBS -lqwt"
-            else
-                dnl Otherwise, check for 'main' in libqwt-qt4 (Ubuntu)
-                LIBS="$qwt_save_LIBS $QT_LIBS $QWT_LIBS -lqwt-qt4"
-                AC_CHECK_LIB([qwt-qt4], [main], [libqwt_ok=yes], [libqwt_ok=no])
-                if test "$libqwt_ok" = "yes" ; then
-                    QWT_LIBS="$QWT_LIBS -lqwt-qt4"
-                else
-                    AC_MSG_RESULT([Could not link to libqwt.so])
-                fi
-            fi
-        fi
-    else
-        AC_MSG_RESULT([Could not find qwt headers])
-    fi
-
-    dnl Restore saved variables
-    LIBS="$qwt_save_LIBS"
-    CPPFLAGS="$qwt_save_CPPFLAGS"
-    AC_LANG_POP
-
-    dnl Execute user actions
-    if test "x$libqwt_ok" = "xyes" ; then
-	ifelse([$1], , :, [$1])
-    else
-	QWT_CFLAGS=""
-	QWT_LIBDIRS=""
-	ifelse([$2], , :, [$2])
-    fi
-
-    dnl Export our variables
-    AC_SUBST(QWT_CFLAGS)
-    AC_SUBST(QWT_LIBS)
-])
diff --git a/config/gr_require_mc4020.m4 b/config/gr_require_mc4020.m4
deleted file mode 100644
index 90774fd33..000000000
--- a/config/gr_require_mc4020.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-dnl
-dnl Copyright 2003,2004 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 
-
-AC_DEFUN([GR_REQUIRE_MC4020],[
-  AC_MSG_CHECKING([for mc4020 A/D driver include file])
-  AC_COMPILE_IFELSE([
-#include <mc4020.h>
-int main (int argc, char **argv)
-{ 
-    return 0;
-}
-],[AC_MSG_RESULT([yes])],
-  [AC_MSG_RESULT([no])
-  AC_MSG_ERROR([mc4020.h not found.])])
-])
diff --git a/config/gr_scripting.m4 b/config/gr_scripting.m4
deleted file mode 100644
index 866b7e017..000000000
--- a/config/gr_scripting.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl
-dnl Copyright 2003 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 
-
-AC_DEFUN([GR_SCRIPTING],[
-  AC_REQUIRE([AC_PROG_LN_S])
-  AC_REQUIRE([AC_PROG_CXX])
-  AC_REQUIRE([AC_PROG_LIBTOOL])
-
-  SWIG_PROG(1.3.31)
-  SWIG_ENABLE_CXX
-  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_set_md_cpu.m4 b/config/gr_set_md_cpu.m4
deleted file mode 100644
index cb5fb5aac..000000000
--- a/config/gr_set_md_cpu.m4
+++ /dev/null
@@ -1,115 +0,0 @@
-dnl
-dnl Copyright 2003,2008,2009 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 
-
-AC_DEFUN([_TRY_ADD_ALTIVEC],
-[
-  LF_CHECK_CC_FLAG([-mabi=altivec -maltivec])
-  LF_CHECK_CXX_FLAG([-mabi=altivec -maltivec])
-])
-
-AC_DEFUN([_FIND_ARM_ISA],
-[
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-  [[#ifndef __ARM_ARCH_5__
-    #error "Not armv5"
-    #endif
-  ]])],
-    [is_armv5=yes],
-    [is_armv5=no])
-
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-  [[#ifndef __ARM_ARCH_7A__
-    #error "Not armv7-a"
-    #endif
-  ]])],
-    [is_armv7_a=yes],
-    [is_armv7_a=no])
-
-])
-
-AC_DEFUN([GR_SET_MD_CPU],[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_ARG_WITH(md-cpu,
-	AC_HELP_STRING([--with-md-cpu=ARCH],[set machine dependent speedups (auto)]),
-		[cf_with_md_cpu="$withval"],
-		[
-  dnl see if the user has specified --host or --build, via 'cross_compiling'
-  if test "$cross_compiling" != no; then
-    dnl when cross-compiling, because the user specified it either via
-    dnl --target or --build, just keep the user's specs & hope for the best.
-    cf_with_md_cpu="$host_cpu"
-  else
-    dnl when the user didn't specify --target or --build, on Darwin 10
-    dnl (OSX 10.6.0 and .1) and GNU libtoool 2.2.6, 'configure' doesn't
-    dnl figure out the CPU type correctly, so do it by hand here using
-    dnl the sizeof (void*): if 4 then use i386, and otherwise use x86_64.
-    case "$host_os" in
-     *darwin*10*)
-      AC_CHECK_SIZEOF(void*)
-      if test "$ac_cv_sizeof_voidp" = 4; then
-       cf_with_md_cpu="i386"
-      else
-       cf_with_md_cpu="x86_64"
-      fi
-      ;;
-     *)
-      cf_with_md_cpu="$host_cpu"
-      ;;
-    esac
-  fi
-  ])
-  case "$cf_with_md_cpu" in
-   x86 | i[[3-7]]86)	MD_CPU=x86	MD_SUBCPU=x86 ;;
-   x86_64)		MD_CPU=x86	MD_SUBCPU=x86_64 ;;
-   powerpc*)            MD_CPU=powerpc ;;
-   arm*)
-       _FIND_ARM_ISA
-       if test $is_armv5 = yes; then MD_CPU=armv5;
-       elif test $is_armv7_a = yes; then MD_CPU=armv7_a;
-       else MD_CPU=generic; fi
-       ;;
-   *)           	MD_CPU=generic ;;
-  esac
-
-  AC_ARG_ENABLE(altivec,
-    AC_HELP_STRING([--enable-altivec],[enable altivec on PowerPC (yes)]),
-    [ if test $MD_CPU = powerpc; then
-        case "$enableval" in
-          (no)  MD_CPU=generic ;;
-          (yes) _TRY_ADD_ALTIVEC ;;
-          (*) AC_MSG_ERROR([Invalid argument ($enableval) to --enable-altivec]) ;;
-        esac
-      fi],
-    [ if test $MD_CPU = powerpc; then _TRY_ADD_ALTIVEC fi])
-
-
-  AC_MSG_CHECKING([for machine dependent speedups])
-  AC_MSG_RESULT($MD_CPU)
-  AC_SUBST(MD_CPU)
-  AC_SUBST(MD_SUBCPU) 
-
-  AM_CONDITIONAL(MD_CPU_x86,     test "$MD_CPU" = "x86")
-  AM_CONDITIONAL(MD_SUBCPU_x86_64,  test "$MD_SUBCPU" = "x86_64")
-  AM_CONDITIONAL(MD_CPU_powerpc, test "$MD_CPU" = "powerpc")
-  AM_CONDITIONAL(MD_CPU_armv5, test "$MD_CPU" = "armv5")
-  AM_CONDITIONAL(MD_CPU_armv7_a, test "$MD_CPU" = "armv7_a")
-  AM_CONDITIONAL(MD_CPU_generic, test "$MD_CPU" = "generic")
-])
diff --git a/config/gr_subversion.m4 b/config/gr_subversion.m4
deleted file mode 100644
index 849d7a9f6..000000000
--- a/config/gr_subversion.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-dnl
-dnl Copyright 2007 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 
-
-# GR_SUBVERSION()
-#
-# Test for presence of subversion, and create variables for 
-# current repository version and last changed date.
-
-AC_DEFUN([GR_SUBVERSION],[
-    	AC_PATH_PROG([SVN],[svn])
-	if test "$SVN" != "" -a -d .svn ; then
-	    SVNVERSION=`$SVN info . | grep '^Revision' | cut -f 2- -d ' '`
-	    SVNDATE=`$SVN info . | grep 'Last Changed Date' | cut -f 4-6 -d ' '`
-	fi
-
-	AC_SUBST(SVNVERSION)
-	AC_SUBST(SVNDATE)
-])
diff --git a/config/gr_swig.m4 b/config/gr_swig.m4
deleted file mode 100644
index dcc2e72dc..000000000
--- a/config/gr_swig.m4
+++ /dev/null
@@ -1,109 +0,0 @@
-dnl
-dnl Copyright 2003 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 
-
-# SWIG_PROG([required-version])
-#
-# Checks for the SWIG program.  If found you can (and should) call SWIG via $(SWIG).
-# You can use the optional first argument to check if the version of the available SWIG
-# 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_CHECK_PROG(SWIG,swig,[`which swig`])
-	if test -z "$SWIG" ; then
-		AC_MSG_ERROR([Cannot find 'swig' program.  SWIG version >= $1 required])
-		SWIG=false
-	elif test -n "$1" ; then
-		AC_MSG_CHECKING([for SWIG version])
-		swig_version=`$SWIG -version 2>&1 | \
-			awk '/^SWIG Version [[0-9]+\.[0-9]+\.[0-9]]+.*$/ { split($[3],a,"[[^.0-9]]"); print a[[1]] }'`
-		AC_MSG_RESULT([$swig_version])
-		if test -n "$swig_version" ; then
-			swig_version=`echo $swig_version | \
-				awk '{ split($[1],a,"\."); print [a[1]*1000000+a[2]*1000+a[3]] }' 2>/dev/null`
-			swig_required_version=`echo $1 | \
-				awk '{ split($[1],a,"\."); print [a[1]*1000000+a[2]*1000+a[3]] }' 2>/dev/null`
-			if test $swig_required_version -gt $swig_version ; then
-				AC_MSG_ERROR([SWIG version >= $1 required])
-			fi
-		else
-			AC_MSG_ERROR([cannot determine SWIG version])
-		fi
-	fi
-])
-
-# SWIG_ENABLE_CXX()
-#
-# Enable swig C++ support.  This effects all invocations of $(SWIG).
-AC_DEFUN([SWIG_ENABLE_CXX],[
-	AC_REQUIRE([SWIG_PROG])
-	AC_REQUIRE([AC_PROG_CXX])
-    	if test "$SWIG" != "false" ; then
-		SWIG="$SWIG -c++"
-        fi
-])
-
-# SWIG_PYTHON([use-shadow-classes])
-#
-# Checks for Python and provides the $(SWIG_PYTHON_CPPFLAGS),
-# $(SWIG_PYTHON_LIB) and $(SWIG_PYTHON_OPT) output variables.
-# $(SWIG_PYTHON_OPT) contains all necessary swig options to generate
-# code for Python.  If you need multi module support use
-# $(SWIG_PYTHON_LIB) (provided by the SWIG_MULTI_MODULE_SUPPORT()
-# macro) to link against the appropriate library.  It contains the
-# SWIG Python runtime library that is needed by the type check system
-# for example.
-
-AC_DEFUN([SWIG_PYTHON],[
-	AC_REQUIRE([SWIG_PROG])
-	AC_REQUIRE([PYTHON_DEVEL])
-	if test "$SWIG" != "false" ; then
-		AC_SUBST(SWIG_PYTHON_LIB,[-lswigpy])
-dnl		test ! "x$1" = "xno" && swig_shadow=" -shadow" || swig_shadow=""
-dnl		AC_SUBST(SWIG_PYTHON_OPT,[-python$swig_shadow])
-		AC_SUBST(SWIG_PYTHON_OPT,[-python])
-	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_sysv_shm.m4 b/config/gr_sysv_shm.m4
deleted file mode 100644
index db5c8351e..000000000
--- a/config/gr_sysv_shm.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-# Check for IPC System V shm support.             -*- Autoconf -*-
-
-# Copyright 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Boston, MA
-# 02110-1301, USA.
-
-AC_DEFUN([GR_SYSV_SHM],
-[
-	AC_LANG_SAVE
-	AC_LANG_C
-
-	AC_CHECK_HEADERS([sys/ipc.h sys/shm.h])
-
-        save_LIBS="$LIBS"
-	AC_SEARCH_LIBS(shmat, [cygipc ipc],
-	  [ IPC_LIBS="$LIBS" ],
-	  [ AC_MSG_WARN([SystemV IPC support not found. ]) ]
-	)
-        LIBS="$save_LIBS"
-
-	AC_LANG_RESTORE
-	AC_SUBST(IPC_LIBS)
-])
diff --git a/config/gr_tcl.m4 b/config/gr_tcl.m4
deleted file mode 100644
index 106bc6515..000000000
--- a/config/gr_tcl.m4
+++ /dev/null
@@ -1,69 +0,0 @@
-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/gr_version.m4 b/config/gr_version.m4
deleted file mode 100644
index a7a202238..000000000
--- a/config/gr_version.m4
+++ /dev/null
@@ -1,73 +0,0 @@
-dnl Copyright 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([GR_VERSION],[
-  dnl Computed version based on version.sh
-  dnl Does not force recompile on rev change
-  dnl
-  dnl Source the variables describing the release version
-  dnl 
-  dnl MAJOR_VERSION          Major release generation (2.x, 3.x, etc.)
-  dnl API_COMPAT             API compatibility version (3.2.x, 3.3.x, etc.)
-  dnl MINOR_VERSION          Minor release version (3.3.0, 3.3.1, etc.)
-  dnl MAINT_VERSION          Pure bugfix additions to make maintenance release
-  dnl
-  dnl The last two fields can have 'git' instead of a number to indicate
-  dnl that this branch is between versions.
-  . $srcdir/version.sh
-  
-  dnl Get git version if available
-  GR_GIT
-
-  dnl Test if we should use git version
-  if test "$MINOR_VERSION" == "git"; then
-    dnl RELEASE: 3.3git-xxx-gxxxxxxxx
-    dnl DOCVER:  3.3git
-    dnl LIBVER:  3.3git
-    RELEASE=$GIT_DESCRIBE
-    DOCVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION
-    LIBVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION
-  else
-    if test "$MAINT_VERSION" == "git" ; then
-      dnl RELEASE: 3.3.1git-xxx-gxxxxxxxx
-      dnl DOCVER:  3.3.1git
-      dnl LIBVER:  3.3.1git
-      RELEASE=$GIT_DESCRIBE
-      DOCVER=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION$MAINT_VERSION
-      LIBVER=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION$MAINT_VERSION
-    else
-      dnl This is a numbered release.
-      dnl RELEASE: 3.3.1{.x}
-      dnl DOCVER:  3.3.1{.x}
-      dnl LIBVER:  3.3.1{.x}
-      RELEASE=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION
-      if test "$MAINT_VERSION" != "0"; then
-        RELEASE=$RELEASE.$MAINT_VERSION
-      fi
-
-      DOCVER=$RELEASE
-      LIBVER=$RELEASE
-    fi
-  fi
-
-  AC_MSG_NOTICE([GNU Radio Release $RELEASE])
-  AC_SUBST(RELEASE)
-  AC_SUBST(DOCVER)
-  AC_SUBST(LIBVER)
-])
diff --git a/config/gr_vmcircbuf.m4 b/config/gr_vmcircbuf.m4
deleted file mode 100644
index cf9e394e7..000000000
--- a/config/gr_vmcircbuf.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-dnl
-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.
-dnl 
-
-AC_DEFUN([GR_VMCIRCBUF],[
-  dnl Control availability of vmcircbuf methods.
-  dnl For now, only allows disabling of shm methods, which cause uncatchable
-  dnl   segmentation faults on Cygwin with gcc 4.x (x <= 5)
-
-  AC_MSG_CHECKING([whether to try shm vmcircbuf methods])
-  AC_ARG_WITH(shm-vmcircbuf,
-              [AS_HELP_STRING([--without-shm-vmcircbuf],
-                              [do not attempt to use shm vmcircbuf methods])],
-              [], [ with_shm_vmcircbuf=yes ])
-  AC_MSG_RESULT($with_shm_vmcircbuf)
-  
-  AS_IF([test "x$with_shm_vmcircbuf" != xno],
-    [AC_DEFINE([TRY_SHM_VMCIRCBUF], [1],
-               [Define if ok to try shm vmcircbuf methods]) ])
-])
diff --git a/config/grc_build.m4 b/config/grc_build.m4
deleted file mode 100644
index 121c4feb6..000000000
--- a/config/grc_build.m4
+++ /dev/null
@@ -1,288 +0,0 @@
-dnl Copyright 2006,2008,2009 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 Create --enable-foo argument for named component, create variables as needed
-dnl $1 is component name
-AC_DEFUN([GRC_ENABLE], [
-    _GRC_ENABLE($1,m4_bpatsubst($1,-,_))
-])
-dnl $2 is the '_'d component name
-dnl on exit variable enable_$2 will be set to [yes|no];
-dnl         passed will be [yes|no] (same as enable_$2)
-
-AC_DEFUN([_GRC_ENABLE],[
-    passed=yes
-    AC_ARG_ENABLE([$1],
-		  AC_HELP_STRING([--enable-$1],
-				 [Stop if $1 fails configuration]),
-		  [],[
-        [enable_]$2=$enable_all_components
-        if test x$enable_all_components = xno; then
-            passed=no
-        fi
-    ])
-])
-dnl Component specific configuration
-dnl The order of the GR_ macros determines the order of compilation
-dnl For -any- checks on $enable_all_components
-dnl use the following guildlines:
-dnl   yes : --enable-all-components was specified, so error out if any
-dnl         components do not pass configuration checks.
-dnl   no  : --disable-all-components was specified, so try to build the
-dnl         --enable'd components, and error out if any do not pass
-dnl         configuration checks.
-dnl   ""  : this option was not specified on the command line; try to
-dnl         build all components that are not --with'd, but don't
-dnl         error out if any component does not pass configuration checks.
-dnl
-dnl For each --enable-foo component, if that flag is not specified on
-dnl the command line, the related variable $enable_foo will be set to
-dnl $enable_all_components .
-
-dnl Create --with-foo argument for named compoment, create variables as needed
-dnl $1 is component name
-dnl $2 is what to do on success
-dnl $3 is the PKG_CONFIG name; if not given, then $1
-AC_DEFUN([GRC_WITH], [
-    if test [x]$3 = x; then
-        pc_comp_name="$1"
-    else
-        pc_comp_name="$3"
-    fi
-    _GRC_WITH($1,[$2],${pc_comp_name},m4_bpatsubst($1,-,_))
-])
-dnl $3 is the pkg-config component name
-dnl $4 is the '_'d component name
-dnl on exit variable passed will be [yes|no|with]:
-dnl   yes: if --enable-$1 and/or --enable-all-components was specified,
-dnl        but --with was not;
-dnl   with: if --with-$1 was specified, and passed checks;
-dnl   no: all other conditions
-AC_DEFUN([_GRC_WITH],[
-    AC_ARG_WITH([$1],
-	        AC_HELP_STRING([--with-$1@<:@=PATH@:>@],
-	 		       [Use package $1 if installed in PATH (if specified) or PKG_CONFIG_PATH (if PATH not specified); stop if $1 not found]),
-                [if test "x$withval" != "xyes"; then
-		    [with_]$4[_val]=$withval
-		    [with_]$4=yes
-		 fi],
-	        [])
-    if test x$[with_]$4 = xyes; then
-        if test x$[enable_]$4 = xyes; then
-	    AC_MSG_ERROR([Component $1: Cannot use both --enable and --with])
-        else
-	    _GRC_WITH_PKG_CONFIG_CHECK($1,$3,$4)
-	    ifelse([$2], , :, [$2])
-        fi
-    fi
-])
-
-dnl Use 'pkgconfig' to check for a package
-dnl $1 is the --with component name
-dnl $2 is the pkg-config component name, if provided; otherwise use $1 for this
-dnl on success, resulting INCLUDES, INCLUDEDIR, LA, and LIBDIRPATH variables
-dnl will be set; on failure, will exit with an error.
-AC_DEFUN([GRC_WITH_PKG_CONFIG_CHECK], [
-    if test [x]$2 = x; then
-        pc_comp_name="$1"
-    else
-        pc_comp_name="$2"
-    fi
-    _GRC_WITH_PKG_CONFIG_CHECK($1,${pc_comp_name},m4_bpatsubst($1,-,_))
-])
-dnl $2 is the pkg-config component name
-dnl $3 is the '_'d component name
-AC_DEFUN([_GRC_WITH_PKG_CONFIG_CHECK],[
-    dnl save PKG_CONFIG_PATH, restore at the end
-    s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-
-    dnl create the PKG_CONFIG_PATH, via this component arg, if provided;
-    dnl else use the environment PKG_CONFIG_PATH
-    l_PKG_CONFIG_PATH=$[with_]$3[_val]
-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
-
-        dnl verify that the file exists; if not, no point in continuing
-        if ! test -r ${l_PKG_CONFIG_PATH}/$2[.pc]; then
-	    AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info for $2, with provided PKG_CONFIG_PATH = @<:@ $l_PKG_CONFIG_PATH @:>@ .])
-        fi
-    fi
-
-    dnl do the check; error out if not found
-    PKG_CHECK_EXISTS($2, [passed=with; check1=yes], [
-        check1=no
-        dnl pkg-config returned an error; this might be that the .pc
-	dnl file was not valid, or the Requires: were not met.
-	dnl If the arg was provided and the input PKG_CONFIG_PATH , then try
-	dnl again appending the whole PKG_CONFIG_PATH.
-	if test "x$l_PKG_CONFIG_PATH" != "x"; then
-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
-	        PKG_CHECK_EXISTS($2, passed=with, passed=no)
-            fi
-        fi
-        if test $passed != with; then
-            AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info for $2, with PKG_CONFIG_PATH = @<:@ $PKG_CONFIG_PATH @:>@ .])
-        fi
-        dnl pkg-config Requires are now met; save the new PKG_CONFIG_PATH
-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-    ])
-
-    dnl if PKG_CHECK_EXISTS returned, then this component's .pc file was
-    dnl found in the provided 'arg' PKG_CONFIG_PATH;
-    dnl retrieve various parameters
-    $3[_INCLUDES]=`$PKG_CONFIG --cflags-only-I $2`
-    $3[_LA]=`$PKG_CONFIG --libs $2`
-    $3[_INCLUDEDIR]=`$PKG_CONFIG --variable=includedir $2`
-
-    if test x$check1 = xyes; then
-        dnl prepend the args PKG_CONFIG_PATH to the saved one, if the
-	dnl saved version was not empty
-        if test "x$s_PKG_CONFIG_PATH" != "x"; then
-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
-        fi
-    fi
-])
-
-dnl Check the $prefix versus the --with libdirpath for this component
-dnl $1 is the prefix
-dnl $2 is the --with component name
-dnl $3 is the --with component library path
-AC_DEFUN([GRC_PREFIX_LDFLAGS],[
-    $2[_LIBDIRPATH]=$3
-    dnl create LDFLAGS for this --with, if different from the provided $prefix
-    if test [x]$1[/lib] != [x]$3; then
-        $2[_LDFLAG]=[-L]$3
-    else
-        $2[_LDFLAG]=
-    fi
-])
-
-dnl Check to make sure this dependency is fulfilled for this component
-dnl $1 is the component's name
-dnl $2 is the component dependency name
-dnl On input and exit, $passed will be:
-dnl   with : if --with passed muster
-dnl   yes  : if --enable passed muster
-dnl   no   : otherwise
-dnl If trying --with, will error-out if any dependency was not --with'd
-AC_DEFUN([GRC_CHECK_DEPENDENCY],[
-dnl    f0=[enable_]m4_bpatsubst($1,-,_)
-dnl    f1=[$enable_]m4_bpatsubst($1,-,_)
-dnl    echo
-dnl    echo "$1 : Checking Dependency $2"
-dnl    echo "$1 : enable_all_components is '$enable_all_components'"
-dnl    echo "$1 : $f0 is '$f1'"
-dnl    echo "$1 : passed is '$passed'"
-dnl    echo
-    if test $passed != no; then
-        if test $passed = yes; then
-            dnl make sure this dependency was not skipped
-            if test [x$]m4_bpatsubst($2,-,_)[_skipped] = xyes; then
-                AC_MSG_RESULT([Component $1 requires $2, which is not being built or specified via pre-installed files.])
-                passed=no
-            fi
-        else
-            dnl make sure this dependency was --with'd only; not --enable'd
-            if test [x$]m4_bpatsubst($2,-,_)[_with] = xno; then
-                AC_MSG_ERROR([Component $1 requires $2 to be included as --with-$2@<:@=arg@:>@])
-            fi
-        fi
-    fi
-])
-
-dnl Check to make sure GUILE is available
-dnl $1 is the component name
-AC_DEFUN([GRC_CHECK_GUILE],[
-    if test x"$GUILE" = x; then
-        AC_MSG_RESULT([Component $1 requires guile, which was not found.])
-        passed=no
-    fi
-])
-
-dnl Add the specified "with" list; clear the provided variable
-dnl $1 is the component name
-dnl $2 is the path list name suffix
-dnl $3 is the separator (for paths, ":"; for includes " ")
-AC_DEFUN([GRC_ADD_TO_LIST],[
-    if test "x${$1[_]$2}" != "x"; then
-        if test "x$[with_]$2" = "x"; then
-            [with_]$2="${$1[_]$2}"
-	else
-	    [with_]$2="${$1[_]$2}"$3"$[with_]$2"
-	fi
-	$1[_]$2=
-    fi
-])
-
-dnl Conditionally build named component.
-dnl $1 is component name
-dnl $2 is executed if configuration passes and build is desired
-AC_DEFUN([GRC_BUILD_CONDITIONAL],[
-    _GRC_BUILD_CONDITIONAL($1, $2, m4_bpatsubst($1,-,_))
-])
-dnl $3=m4_bpatsubst($1,-,_)
-dnl Use $passed=no to indicate configuration failure;
-dnl Use $passed=with to indicate the use of pre-installed libraries and headers;
-dnl Any other value of $passed, including blank, assumes success;
-dnl Defines $3_with=[yes|no] depending on if $passed=with or not (respectively)
-dnl Defines $3_skipped=[yes|no] depending on if $passed=no or not (respectively)
-AC_DEFUN([_GRC_BUILD_CONDITIONAL],[
-    $3[_with]=no
-    if test $passed = no; then
-	if test x$[enable_]$3 = xyes; then
-	    AC_MSG_ERROR([Component $1 has errors; stopping.])
-	else
-	    AC_MSG_RESULT([Not building component $1.])
-	fi
-    else
-        if test $passed = with; then
-	    with_dirs="$with_dirs $1"
-	    GRC_ADD_TO_LIST($3, INCLUDES, " ")
-	    GRC_ADD_TO_LIST($3, SWIG_INCLUDES, " ")
-	    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
-	    $3[_LDFLAG]=
-            if test x$[enable_]$3 != xno; then
-	        ifelse([$2], , :, [$2])
-	        build_dirs="$build_dirs $1"
-	        AC_MSG_RESULT([Component $1 passed configuration checks; building.])
-            else
-	        passed=no
-	        AC_MSG_RESULT([Component $1 passed configuration checks; but not building.])
-	    fi
-	fi
-    fi
-    if test $passed = no; then
-        skipped_dirs="$skipped_dirs $1"
-        $3[_skipped]=yes
-    else
-        $3[_skipped]=no
-    fi
-    AC_SUBST($3[_INCLUDES])
-    AC_SUBST($3[_LA])
-    AC_SUBST($3[_INCLUDEDIR])
-    AC_SUBST($3[_LIBDIRPATH])
-    AC_SUBST($3[_LDFLAG])
-])
diff --git a/config/grc_docs.m4 b/config/grc_docs.m4
deleted file mode 100644
index 8ac0e9a42..000000000
--- a/config/grc_docs.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl Copyright 2009 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_DOCS],[
-    GRC_ENABLE(docs)
-
-    AC_CONFIG_FILES([ \
-	docs/Makefile \
-        docs/doxygen/Doxyfile \
-        docs/doxygen/Makefile \
-        docs/doxygen/other/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(docs)
-
-])
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
deleted file mode 100644
index 229efbd01..000000000
--- a/config/grc_gnuradio_core.m4
+++ /dev/null
@@ -1,121 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009 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_GNURADIO_CORE],[
-    GRC_ENABLE(gnuradio-core)
-
-    GRC_WITH(gnuradio-core, [
-        dnl gnuradio-core has some extra defines if --with specified
-	gnuradio_core_SWIGDIRPATH="$gnuradio_core_INCLUDEDIR/swig"
-	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
-    GRC_CHECK_DEPENDENCY(gnuradio-core, gruel)
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed = yes; then	
-	dnl look for fast CBLAS for GSL, but don't complain if not found
-	ACX_CBLAS([],[])
-        dnl check for GSL
-	PKG_CHECK_MODULES(GSL, gsl >= 1.10,
-	    [], dnl FIXME remove -lgslcblas from GSL_LIBS if we found a better CBLAS_LIBS above
-	    [passed=no;AC_MSG_RESULT([gnuradio-core requires package gsl >= 1.10, not found.])])
-    fi
-
-    if test $passed != with; then
-	dnl how and where to find INCLUDES and LA and such
-        gnuradio_core_INCLUDES="\
--I\${abs_top_srcdir}/gnuradio-core/src/lib/runtime \
--I\${abs_top_srcdir}/gnuradio-core/src/lib/general \
--I\${abs_top_builddir}/gnuradio-core/src/lib/general \
--I\${abs_top_srcdir}/gnuradio-core/src/lib/gengen \
--I\${abs_top_builddir}/gnuradio-core/src/lib/gengen \
--I\${abs_top_srcdir}/gnuradio-core/src/lib/filter \
--I\${abs_top_builddir}/gnuradio-core/src/lib/filter \
--I\${abs_top_srcdir}/gnuradio-core/src/lib/missing \
--I\${abs_top_srcdir}/gnuradio-core/src/lib/reed-solomon \
--I\${abs_top_srcdir}/gnuradio-core/src/lib/viterbi \
--I\${abs_top_srcdir}/gnuradio-core/src/lib/io \
--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"
-        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"
-	gnuradio_core_SWIGDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib/swig:\${abs_top_builddir}/gnuradio-core/src/lib/swig/.libs:\${abs_top_srcdir}/gnuradio-core/src/lib/swig"
-	gnuradio_core_PYDIRPATH="\${abs_top_srcdir}/gnuradio-core/src/python"
-    fi
-
-    dnl other externally-required gnuradio-core variables
-    AC_SUBST(gnuradio_core_I)
-    AC_SUBST(gnuradio_core_SWIGDIRPATH)
-    AC_SUBST(gnuradio_core_PYDIRPATH)
-
-    AC_CONFIG_FILES([ \
-        gnuradio-core/Makefile
-        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/general/Makefile \
-        gnuradio-core/src/lib/general/gr_constants.cc \
-        gnuradio-core/src/lib/gengen/Makefile \
-        gnuradio-core/src/lib/io/Makefile \
-        gnuradio-core/src/lib/missing/Makefile \
-        gnuradio-core/src/lib/reed-solomon/Makefile \
-        gnuradio-core/src/lib/viterbi/Makefile \
-        gnuradio-core/src/lib/runtime/Makefile \
-	gnuradio-core/src/lib/hier/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/blks2/Makefile \
-        gnuradio-core/src/python/gnuradio/blks2impl/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 \
-    ])
-
-    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
-	  chmod +x gnuradio-core/src/guile/run_guile_tests
-	]) \
-    ])
-
-])
diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4
deleted file mode 100644
index e60442170..000000000
--- a/config/grc_gnuradio_examples.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009,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_GNURADIO_EXAMPLES],[
-    GRC_ENABLE(gnuradio-examples)
-
-    dnl Do not do gnuradio-examples if gnuradio-core or gr-audio skipped
-    GRC_CHECK_DEPENDENCY(gnuradio-examples, gnuradio-core)
-    GRC_CHECK_DEPENDENCY(gnuradio-examples, gr-audio)
-
-    AC_CONFIG_FILES([ \
-        gnuradio-examples/Makefile \
-	gnuradio-examples/python/Makefile \
-	gnuradio-examples/grc/Makefile \
-   	gnuradio-examples/python/mp-sched/Makefile \
-   	gnuradio-examples/python/network/Makefile \
-   	gnuradio-examples/python/pfb/Makefile \
-   	gnuradio-examples/python/tags/Makefile \
-	gnuradio-examples/waveforms/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gnuradio-examples)
-])
diff --git a/config/grc_gr_atsc.m4 b/config/grc_gr_atsc.m4
deleted file mode 100644
index 6dfb40132..000000000
--- a/config/grc_gr_atsc.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,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
-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_ATSC],[
-    GRC_ENABLE(gr-atsc)
-
-    dnl Don't do gr-atsc if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-atsc, gnuradio-core)
-
-    AC_CONFIG_FILES([\
-        gr-atsc/Makefile \
-	gr-atsc/gnuradio-atsc.pc \
-        gr-atsc/doc/Makefile \
-        gr-atsc/src/Makefile \
-        gr-atsc/src/lib/Makefile \
-        gr-atsc/src/python/Makefile \
-        gr-atsc/src/python/run_tests \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-atsc,[
-        dnl run_tests is created from run_tests.in.  Make it executable.
-	AC_CONFIG_COMMANDS([run_tests_atsc], [chmod +x gr-atsc/src/python/run_tests])
-    ])
-])
diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4
deleted file mode 100644
index 0e881671a..000000000
--- a/config/grc_gr_audio.m4
+++ /dev/null
@@ -1,116 +0,0 @@
-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_AUDIO],[
-    GRC_ENABLE(gr-audio)
-
-    GRC_CHECK_DEPENDENCY(gr-audio, gnuradio-core)
-
-    ####################################################################
-    ## ALSA Support
-    ####################################################################
-    PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[GR_AUDIO_ALSA_SUPPORT=true],
-        [GR_AUDIO_ALSA_SUPPORT=false;AC_MSG_RESULT([gr-audio alsa support requires package alsa, not found.])])
-    AM_CONDITIONAL(GR_AUDIO_ALSA_SUPPORT, $GR_AUDIO_ALSA_SUPPORT)
-
-    ####################################################################
-    ## OSS Support
-    ####################################################################
-    dnl Make sure the correct library and/or headers are available.
-    case $host_os in
-    netbsd*)
-        AC_HAVE_LIBRARY(ossaudio,[GR_AUDIO_OSS_SUPPORT=true],
-            [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires library ossaudio, not found.])])
-        if test $GR_AUDIO_OSS_SUPPORT != false; then
-            OSS_LIBS=-lossaudio
-            AC_SUBST(OSS_LIBS)
-            AC_MSG_RESULT([Using OSS library $OSS_LIBS])
-        fi
-        ;;
-    darwin*)
-        dnl OSX / Darwin can't use OSS
-        GR_AUDIO_OSS_SUPPORT=false
-        ;;
-    *)
-        AC_CHECK_HEADER(sys/soundcard.h,[GR_AUDIO_OSS_SUPPORT=true],
-            [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires sys/soundcard.h, not found.])])
-    esac
-    AM_CONDITIONAL(GR_AUDIO_OSS_SUPPORT, $GR_AUDIO_OSS_SUPPORT)
-
-    ####################################################################
-    ## Jack Support
-    ####################################################################
-    PKG_CHECK_MODULES(JACK, jack >= 0.8, [GR_AUDIO_JACK_SUPPORT=true],
-        [GR_AUDIO_JACK_SUPPORT=false;AC_MSG_RESULT([gr-audio jack support requires package jack, not found.])])
-    AM_CONDITIONAL(GR_AUDIO_JACK_SUPPORT, $GR_AUDIO_JACK_SUPPORT)
-
-    ####################################################################
-    ## OSX Support
-    ####################################################################
-    case "$host_os" in
-    darwin*)
-        MACOSX_AUDIOUNIT([GR_AUDIO_OSX_SUPPORT=true],
-            [GR_AUDIO_OSX_SUPPORT=false;AC_MSG_RESULT([gr-audio osx support requires AudioUnit, not found.])])
-        ;;
-    *)
-        AC_MSG_RESULT([gr-audio osx support will build on Mac OS X and Darwin only.])
-        GR_AUDIO_OSX_SUPPORT=false
-        ;;
-    esac
-    AM_CONDITIONAL(GR_AUDIO_OSX_SUPPORT, $GR_AUDIO_OSX_SUPPORT)
-
-    ####################################################################
-    ## PortAudio Support
-    ####################################################################
-    PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[GR_AUDIO_PORTAUDIO_SUPPORT=true],
-        [GR_AUDIO_PORTAUDIO_SUPPORT=false;AC_MSG_RESULT([gr-audio portaudio support requires package portaudio, not found.])])
-    AM_CONDITIONAL(GR_AUDIO_PORTAUDIO_SUPPORT, $GR_AUDIO_PORTAUDIO_SUPPORT)
-
-    ####################################################################
-    ## Windows Support
-    ####################################################################
-    case "$host_os" in
-        cygwin*|win*|mingw*)
-        AC_HAVE_LIBRARY(winmm, [GR_AUDIO_WINDOWS_SUPPORT=true],
-            [GR_AUDIO_WINDOWS_SUPPORT=false;AC_MSG_RESULT([gr-audio windows support requires library winmm, not found.])])
-        ;;
-    *)
-        AC_MSG_RESULT([gr-audio windows support will build on a Windows Unix environment only.])
-        GR_AUDIO_WINDOWS_SUPPORT=false
-        ;;
-    esac
-    WINAUDIO_LIBS=-lwinmm
-    AC_SUBST(WINAUDIO_LIBS)
-    AM_CONDITIONAL(GR_AUDIO_WINDOWS_SUPPORT, $GR_AUDIO_WINDOWS_SUPPORT)
-
-    AC_CONFIG_FILES([ \
-        gr-audio/Makefile \
-	gr-audio/examples/Makefile \
-	gr-audio/examples/c++/Makefile \
-	gr-audio/examples/python/Makefile \
-        gr-audio/grc/Makefile \
-        gr-audio/include/Makefile \
-        gr-audio/lib/Makefile \
-        gr-audio/swig/Makefile \
-	gr-audio/doc/Makefile \
-        gr-audio/gnuradio-audio.pc \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-audio)
-])
diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4
deleted file mode 100644
index 7e54b0f5a..000000000
--- a/config/grc_gr_comedi.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,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
-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_COMEDI],[
-    GRC_ENABLE(gr-comedi)
-
-    dnl Don't do gr-comedi if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-comedi, gnuradio-core)
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed = yes; then
-        dnl Don't do gr-comedi if the 'comedi' library is unavailable.
-        PKG_CHECK_MODULES(COMEDI, comedilib >= 0.8,[],
-            [passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])])
-    fi
-
-    AC_CONFIG_FILES([ \
-        gr-comedi/Makefile \
-	gr-comedi/gnuradio-comedi.pc \
-        gr-comedi/src/Makefile \
-        gr-comedi/src/run_tests \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-comedi,[
-	dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_comedi], [chmod +x gr-comedi/src/run_tests])
-    ])
-])
diff --git a/config/grc_gr_digital.m4 b/config/grc_gr_digital.m4
deleted file mode 100644
index 9beb59d4b..000000000
--- a/config/grc_gr_digital.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-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_DIGITAL],[
-    GRC_ENABLE(gr-digital)
-
-    dnl Don't do gr-digital if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-digital, gnuradio-core)
-
-    if test $passed != with; then
-	dnl how and where to find INCLUDES and LA and such
-        gr_digital_INCLUDES="\
--I\${abs_top_srcdir}/gr-digital/include \
--I\${abs_top_srcdir}/gr-digital/swig"
-        gr_digital_LA="\${abs_top_builddir}/gr-digital/lib/libgnuradio-digital.la"
-	gr_digital_LIBDIRPATH="\${abs_top_builddir}/gr-digital/lib:\${abs_top_builddir}/gr-digital/lib/.libs"
-	gr_digital_SWIGDIRPATH="\${abs_top_builddir}/gr-digtial/lib/swig:\${abs_top_builddir}/gr-digital/swig/.libs:\${abs_top_srcdir}/gr-digital/swig"
-	gr_digital_PYDIRPATH="\${abs_top_srcdir}/gr-digital/python"
-    fi
-
-    AC_SUBST(gr_digital_I)
-    AC_SUBST(gr_digital_SWIGDIRPATH)
-    AC_SUBST(gr_digital_PYDIRPATH)
-
-    AC_CONFIG_FILES([\
-        gr-digital/Makefile \
-	gr-digital/gnuradio-digital.pc \
-	gr-digital/apps/Makefile \
-	gr-digital/grc/Makefile \
-        gr-digital/include/Makefile \
-        gr-digital/lib/Makefile \
-	gr-digital/python/Makefile \
-	gr-digital/python/run_tests \
-	gr-digital/python/utils/Makefile \
-	gr-digital/swig/Makefile \
-	gr-digital/swig/run_guile_tests \
-	gr-digital/examples/Makefile \
-	gr-digital/doc/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-digital,[
-        dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_digital],
-			   [chmod +x gr-digital/python/run_tests
-			    chmod +x gr-digital/swig/run_guile_tests])
-    ])
-])
diff --git a/config/grc_gr_noaa.m4 b/config/grc_gr_noaa.m4
deleted file mode 100644
index 54df77503..000000000
--- a/config/grc_gr_noaa.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-dnl Copyright 2009 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_NOAA],[
-    GRC_ENABLE(gr-noaa)
-
-    dnl Don't do gr-noaa if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-noaa, gnuradio-core)
-    GRC_CHECK_DEPENDENCY(gr-noaa, gr-wxgui)
-    GRC_CHECK_DEPENDENCY(gr-noaa, grc)
-
-    AC_CONFIG_FILES([\
-        gr-noaa/Makefile \
-	gr-noaa/apps/Makefile \
-	gr-noaa/grc/Makefile \
-	gr-noaa/lib/Makefile \
-	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-noaa/swig/run_guile_tests])
-
-    ])
-])
diff --git a/config/grc_gr_pager.m4 b/config/grc_gr_pager.m4
deleted file mode 100644
index 5330fce3a..000000000
--- a/config/grc_gr_pager.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl Copyright 2006,2008,2009 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_PAGER],[
-    GRC_ENABLE(gr-pager)
-
-    dnl Don't do gr-pager if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-pager, gnuradio-core)
-
-    AC_CONFIG_FILES([\
-        gr-pager/Makefile \
-	gr-pager/gnuradio-pager.pc \
-	gr-pager/apps/Makefile \
-	gr-pager/grc/Makefile \
-        gr-pager/lib/Makefile \
-	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
-			    chmod +x gr-pager/swig/run_guile_tests])
-    ])
-])
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
deleted file mode 100644
index d9e0fcbe9..000000000
--- a/config/grc_gr_qtgui.m4
+++ /dev/null
@@ -1,107 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,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_QTGUI],[
-    GRC_ENABLE(gr-qtgui)
-
-    dnl Don't do gr-qtgui if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-qtgui, gnuradio-core)
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-
-    PYTHON_CHECK_MODULE([PyQt4.QtCore], [PyQt4 for Qt4], \
-        [], [passed=no], \
-        [PyQt4.QtCore.PYQT_VERSION >= 260000])
-
-    PYTHON_CHECK_MODULE([PyQt4.Qwt5], [PyQwt5 for Qt4], \
-       [], [passed=no], \
-       [PyQt4.Qwt5.QWT_VERSION >= 327000])
-
-# Check for: 
-#	QtOpenGL
-#	QtGui
-#	QtCore
-#	qwt 
-#	qt4
-
-# qt4-core, qt4-gui, qwt5-qt4, qwt5-qt4-dev, qt4-dev-tools
-
-    if test $passed = yes; then
-        dnl Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS
-        PKG_CHECK_MODULES(QTCORE, QtCore >= 4.4, [],
-	    [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore >= 4.4.])])
-        PKG_CHECK_MODULES(QTGUI, QtGui >= 4.4, [],
-	    [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui >= 4..])])
-	
-        dnl Fetch QWT variables
-        GR_QWT([], [passed=no])
-
-	dnl Export the include dirs and libraries (note: QTOPENGL_LIBS includes links
-	dnl to QtCore and QtGui libraries)
-	QT_INCLUDES="$QWT_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
-	QT_LIBS="$QWT_LIBS"
-
-        dnl Build an includes variable specifically for running qmake by extracting
-        dnl all includes from the QWT, without the -I;
-        dnl qmake appends the -I when processing the project file INCLUDEPATH
-        for i in $QWT_CFLAGS; do
-            QMAKE_INCLUDES="$QMAKE_INCLUDES ${i##-I}"
-        done
-
-	QT_MOC_EXEC=`pkg-config --variable=moc_location QtCore`
-	QT_UIC_EXEC=`pkg-config --variable=uic_location QtCore`
-
-        gr_qtgui_INCLUDES="\
--I\${abs_top_srcdir}/gr-qtgui/include \
--I\${abs_top_srcdir}/gr-qtgui/swig"
-        gr_qtgui_LA="\${abs_top_builddir}/gr-qtgui/lib/libgnuradio-qtgui.la"
-	gr_qtgui_LIBDIRPATH="\${abs_top_builddir}/gr-qtgui/lib:\${abs_top_builddir}/gr-qtgui/lib/.libs"
-	gr_qtgui_SWIGDIRPATH="\${abs_top_builddir}/gr-digtial/lib/swig:\${abs_top_builddir}/gr-qtgui/swig/.libs:\${abs_top_srcdir}/gr-qtgui/swig"
-	gr_qtgui_PYDIRPATH="\${abs_top_srcdir}/gr-qtgui/python"
-
-        AC_SUBST(QMAKE_INCLUDES)
-        AC_SUBST(QT_INCLUDES)
-	AC_SUBST(QT_LIBS)
-	AC_SUBST(QT_MOC_EXEC)
-	AC_SUBST(QT_UIC_EXEC)
-    fi
-
-    AC_CONFIG_FILES([ \
-        gr-qtgui/Makefile \
-	gr-qtgui/gnuradio-qtgui.pc \
-        gr-qtgui/apps/Makefile \
-        gr-qtgui/examples/Makefile \
-        gr-qtgui/grc/Makefile \
-	gr-qtgui/include/Makefile \
-        gr-qtgui/lib/Makefile \
-        gr-qtgui/python/Makefile \
-        gr-qtgui/python/run_tests \
-        gr-qtgui/swig/Makefile \
-	gr-qtgui/doc/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-qtgui,[
-        dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_qtgui],
-			   [chmod +x gr-qtgui/python/run_tests])
-    ])
-])
diff --git a/config/grc_gr_shd.m4 b/config/grc_gr_shd.m4
deleted file mode 100644
index d09505fbf..000000000
--- a/config/grc_gr_shd.m4
+++ /dev/null
@@ -1,59 +0,0 @@
-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_trellis.m4 b/config/grc_gr_trellis.m4
deleted file mode 100644
index 57c75bf51..000000000
--- a/config/grc_gr_trellis.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,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_TRELLIS],[
-    GRC_ENABLE(gr-trellis)
-
-    dnl Don't do gr-trellis if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-trellis, gnuradio-core)
-    GRC_CHECK_DEPENDENCY(gr-trellis, gr-digital)
-
-    AC_CONFIG_FILES([\
-        gr-trellis/Makefile \
-	gr-trellis/gnuradio-trellis.pc \
-        gr-trellis/doc/Makefile \
-        gr-trellis/grc/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 \
-        gr-trellis/src/examples/fsm_files/Makefile
-    ])
-
-    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;
-			    chmod +x gr-trellis/src/lib/run_guile_tests])
-    ])
-])
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4
deleted file mode 100644
index 11956b91a..000000000
--- a/config/grc_gr_uhd.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl Copyright 2010-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_UHD],[
-    GRC_ENABLE(gr-uhd)
-
-    dnl Dont do gr-uhd if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-uhd, gnuradio-core)
-
-    if test $passed = yes; then
-        dnl Don't do gr-uhd if the 'uhd' package is not installed
-        PKG_CHECK_MODULES(
-            [UHD], [uhd >= 3.0.0 uhd < 4.0.0], [],
-            [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 3.x.x])]
-        )
-        UHD_CPPFLAGS="${UHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-uhd/include"
-        AC_SUBST(UHD_CPPFLAGS)
-        AC_SUBST(UHD_LIBS)
-
-	# Use this to tell the Makefile whether to define
-	# GR_HAVE_UHD for swig.
-    fi
-
-    AM_CONDITIONAL([GR_DEFINE_HAVE_UHD],[test $passed = yes])
-
-    AC_CONFIG_FILES([ \
-        gr-uhd/gnuradio-uhd.pc \
-        gr-uhd/Makefile \
-        gr-uhd/grc/Makefile \
-        gr-uhd/include/Makefile \
-        gr-uhd/lib/Makefile \
-        gr-uhd/swig/Makefile \
-        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/doc/Makefile \
-    ])
-
-    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
deleted file mode 100644
index c3d2667ca..000000000
--- a/config/grc_gr_usrp.m4
+++ /dev/null
@@ -1,43 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,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_USRP],[
-    GRC_ENABLE(gr-usrp)
-
-    dnl Don't do gr-usrp if usrp or gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-usrp, usrp)
-    GRC_CHECK_DEPENDENCY(gr-usrp, gnuradio-core)
-
-    AC_CONFIG_FILES([ \
-        gr-usrp/Makefile \
-        gr-usrp/grc/Makefile \
-	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
-			    chmod +x gr-usrp/src/run_guile_tests])
-    ])
-])
diff --git a/config/grc_gr_usrp2.m4 b/config/grc_gr_usrp2.m4
deleted file mode 100644
index 4ee29861b..000000000
--- a/config/grc_gr_usrp2.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-dnl Copyright 2008,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_USRP2],[
-    GRC_ENABLE(gr-usrp2)
-
-    dnl Don't do gr-usrp if gnuradio-core or usrp2 skipped
-    GRC_CHECK_DEPENDENCY(gr-usrp2, usrp2)
-    GRC_CHECK_DEPENDENCY(gr-usrp2, gnuradio-core)
-
-    AC_CONFIG_FILES([ \
-        gr-usrp2/Makefile \
-	gr-usrp2/apps/Makefile \
-        gr-usrp2/grc/Makefile \
-	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 gr-usrp2/src/run_guile_tests])
-    ])
-])
diff --git a/config/grc_gr_utils.m4 b/config/grc_gr_utils.m4
deleted file mode 100644
index cb71ad18b..000000000
--- a/config/grc_gr_utils.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2007,2008 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_GR_UTILS],[
-    GRC_ENABLE(gr-utils)
-
-    dnl Don't do gr-utils if gnuradio-core or gr-wxgui skipped
-    GRC_CHECK_DEPENDENCY(gr-utils, gnuradio-core)
-    GRC_CHECK_DEPENDENCY(gr-utils, gr-wxgui)
-
-    AC_CONFIG_FILES([ \
-        gr-utils/Makefile \
-        gr-utils/src/Makefile \
-        gr-utils/src/lib/Makefile \
-        gr-utils/src/python/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-utils)
-])
diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4
deleted file mode 100644
index c890bc31c..000000000
--- a/config/grc_gr_video_sdl.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 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_VIDEO_SDL],[
-    GRC_ENABLE([gr-video-sdl])
-
-    dnl Don't do gr-video-sdl if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-video-sdl, gnuradio-core)
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed = yes; then
-        dnl Don't do gr-video-sdl if the SDL library is unavailable.
-	PKG_CHECK_MODULES(SDL, sdl >= 1.2.0, [],
-          [SDL_VERSION=1.2.0
-           AM_PATH_SDL($SDL_VERSION, [], [
-             passed=no;AC_MSG_RESULT([gr-video-sdl requires library sdl, not found or failed test.])])])
-    fi
-
-    AC_CONFIG_FILES([ \
-        gr-video-sdl/Makefile \
-	gr-video-sdl/gnuradio-video-sdl.pc \
-        gr-video-sdl/src/Makefile \
-        gr-video-sdl/src/run_tests \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-video-sdl,[
-	dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_sdl], [chmod +x gr-video-sdl/src/run_tests])
-    ])
-])
diff --git a/config/grc_gr_vocoder.m4 b/config/grc_gr_vocoder.m4
deleted file mode 100644
index df75656fe..000000000
--- a/config/grc_gr_vocoder.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-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_VOCODER],[
-    GRC_ENABLE(gr-vocoder)
-
-    dnl Don't do gr-vocoder if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-fr-vocoder, gnuradio-core)
-
-    AC_CONFIG_FILES([\
-        gr-vocoder/Makefile \
-	gr-vocoder/gnuradio-vocoder.pc \
-        gr-vocoder/apps/Makefile \
-        gr-vocoder/doc/Makefile \
-        gr-vocoder/examples/Makefile \
-        gr-vocoder/grc/Makefile \
-        gr-vocoder/include/Makefile \
-        gr-vocoder/lib/Makefile \
-	gr-vocoder/lib/codec2/Makefile \
-	gr-vocoder/lib/g7xx/Makefile \
-	gr-vocoder/lib/gsm/Makefile \
-        gr-vocoder/python/Makefile \
-	gr-vocoder/python/run_tests \
-	gr-vocoder/swig/Makefile \
-	gr-vocoder/swig/run_guile_tests \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-vocoder,[
-        dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_vocoder], [chmod +x gr-vocoder/python/run_tests])
-	AC_CONFIG_COMMANDS([run_tests_vocoder_guile], [chmod +x gr-vocoder/swig/run_guile_tests])
-    ])
-])
diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4
deleted file mode 100644
index 17925fcc5..000000000
--- a/config/grc_gr_wxgui.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,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
-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_WXGUI],[
-    GRC_ENABLE(gr-wxgui)
-    GRC_WITH(gr-wxgui)
-
-    dnl Don't do gr-wxgui if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-wxgui, gnuradio-core)
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed = yes; then
-        PYTHON_CHECK_MODULE([wx],[Python wxWidgets wrappers >= 2.8],[],[passed=no],[wx.version().split()[[0]] >= "2.8"])
-        PYTHON_CHECK_MODULE([numpy],[Numeric Python extensions],[],[passed=no])
-    fi
-
-    AC_CONFIG_FILES([ \
-        gr-wxgui/Makefile \
-        gr-wxgui/gr-wxgui.pc \
-        gr-wxgui/grc/Makefile \
-        gr-wxgui/src/Makefile \
-        gr-wxgui/src/python/Makefile \
-        gr-wxgui/src/python/plotter/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-wxgui)
-])
diff --git a/config/grc_grc.m4 b/config/grc_grc.m4
deleted file mode 100644
index 0474c4e89..000000000
--- a/config/grc_grc.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-dnl Copyright 2008, 2009, 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_GRC],[
-    GRC_ENABLE(grc)
-
-    AC_CHECK_PROG(XDG_UTILS, xdg-mime, true, false)
-    AM_CONDITIONAL(XDG_UTILS, $XDG_UTILS)
-
-    dnl ########################################
-    dnl # test python modules and versions
-    dnl ########################################
-    if test $passed = yes; then
-        PYTHON_CHECK_MODULE([sys],[Python >= 2.5],[],[passed=no],[sys.version.split()[[0]] >= "2.5"])
-        PYTHON_CHECK_MODULE([Cheetah],[Python Cheetah templates >= 2.0.0],[],[passed=no],[Cheetah.Version >= "2.0.0"])
-        PYTHON_CHECK_MODULE([lxml.etree],[Python lxml wrappers >= 1.3.6],[],[passed=no],[lxml.etree.LXML_VERSION >= (1, 3, 6, 0)])
-        PYTHON_CHECK_MODULE([gtk],[Python gtk wrappers >= 2.10.0],[],[passed=no],[gtk.pygtk_version >= (2, 10, 0)])
-        PYTHON_CHECK_MODULE([numpy],[NumPy],[],[passed=no],[True])
-    fi
-
-    AC_CONFIG_FILES([ \
-        grc/Makefile \
-        grc/base/Makefile \
-        grc/blocks/Makefile \
-        grc/freedesktop/Makefile \
-        grc/grc_gnuradio/Makefile \
-        grc/gui/Makefile \
-        grc/python/Makefile \
-        grc/scripts/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(grc)
-])
diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4
deleted file mode 100644
index c3238b39e..000000000
--- a/config/grc_gruel.m4
+++ /dev/null
@@ -1,66 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 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_GRUEL],[
-    GRC_ENABLE(gruel)
-    GRC_WITH(gruel)
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed != with; then
-	dnl how and where to find INCLUDES and LA and such
-	gruel_INCLUDES="\
--I\${abs_top_srcdir}/gruel/src/include \
--I\${abs_top_builddir}/gruel/src/include"
-        gruel_LA="\${abs_top_builddir}/gruel/src/lib/libgruel.la"
-	gruel_LIBDIRPATH="\${abs_top_builddir}/gruel/src/lib:\${abs_top_builddir}/gruel/src/lib/.libs"
-    fi
-
-    AC_CONFIG_FILES([\
-        gruel/Makefile \
-        gruel/gruel.pc \
-        gruel/src/Makefile \
-        gruel/src/include/Makefile \
-        gruel/src/include/gruel/Makefile \
-	gruel/src/include/gruel/inet.h \
-        gruel/src/lib/Makefile \
-        gruel/src/swig/Makefile \
-        gruel/src/python/Makefile \
-        gruel/src/python/run_tests \
-	gruel/src/lib/pmt/Makefile \
-	gruel/src/lib/msg/Makefile \
-	gruel/src/scheme/Makefile \
-	gruel/src/scheme/gnuradio/Makefile \
-    ])
-
-
-    dnl Allow creating autoconf independent header files for bytesex routines
-    AC_CHECK_HEADER(arpa/inet.h, [GR_HAVE_ARPA_INET=1],[GR_HAVE_ARPA_INET=0])
-    AC_CHECK_HEADER(netinet/in.h, [GR_HAVE_NETINET_IN=1],[GR_HAVE_NETINET_IN=0])
-    AC_CHECK_HEADER(byteswap.h, [GR_HAVE_BYTESWAP=1],[GR_HAVE_BYTESWAP=0])
-    AC_SUBST(GR_HAVE_ARPA_INET)
-    AC_SUBST(GR_HAVE_NETINET_IN)
-    AC_SUBST(GR_HAVE_BYTESWAP)
-
-    GRC_BUILD_CONDITIONAL(gruel,[
-        AC_CONFIG_COMMANDS([run_tests_gruel],[chmod +x gruel/src/python/run_tests])
-    ])
-])
diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
deleted file mode 100644
index 999b9c5c3..000000000
--- a/config/grc_usrp.m4
+++ /dev/null
@@ -1,90 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009 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_USRP],[
-    GRC_ENABLE(usrp)
-
-    GRC_WITH(usrp)
-
-    dnl Don't do usrp if gruel is skipped
-    GRC_CHECK_DEPENDENCY(usrp, gruel)
-
-    dnl Make sure the fast usb technique is set, OS dependent.
-    dnl This is always performed, since it puts out CLI flags.
-    USRP_SET_FUSB_TECHNIQUE(${enable_usrp})
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed = yes; then
-        dnl gnulib.
-        dnl FIXME: this needs to fail gracefully and continue, not implemented yet
-        UTILS_FUNC_MKSTEMP
-
-        dnl These checks don't fail
-        AC_C_BIGENDIAN
-        AC_CHECK_HEADERS([byteswap.h linux/compiler.h])
-        AC_CHECK_FUNCS([getrusage sched_setscheduler pthread_setschedparam])
-        AC_CHECK_FUNCS([sigaction snprintf])
-
-	dnl Make sure libusb version is installed; required for legacy USB
-        USRP_LIBUSB([$req_libusb1],[],[passed=no;AC_MSG_RESULT([Unable to find dependency libusb.])])
-
-	dnl Make sure SDCC >= 2.4.0 is available.
-        USRP_SDCC([2.4.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler SDCC.])])
-    fi
-    if test $passed != with; then
-	dnl how and where to find INCLUDES and LA
-	usrp_INCLUDES=" \
-		-I\${abs_top_srcdir}/usrp/host/include \
-		-I\${abs_top_builddir}/usrp/host/include \
-		-I\${abs_top_srcdir}/usrp/firmware/include"
-        usrp_LA="\${abs_top_builddir}/usrp/host/lib/libusrp.la"
-    fi
-
-    AC_CONFIG_FILES([ \
-	usrp/Makefile \
-	usrp/usrp.pc \
-        usrp/usrp.iss \
-        usrp/doc/Doxyfile \
-        usrp/doc/Makefile \
-        usrp/doc/other/Makefile \
-        usrp/host/Makefile \
-	usrp/host/include/Makefile \
-	usrp/host/include/usrp/Makefile \
-        usrp/host/misc/Makefile \
-        usrp/host/lib/Makefile \
-        usrp/host/lib/std_paths.h \
-        usrp/host/swig/Makefile \
-        usrp/host/apps/Makefile \
-        usrp/firmware/Makefile \
-        usrp/firmware/include/Makefile \
-        usrp/firmware/lib/Makefile \
-        usrp/firmware/src/Makefile \
-        usrp/firmware/src/common/Makefile \
-        usrp/firmware/src/usrp2/Makefile \
-        usrp/fpga/Makefile \
-        usrp/fpga/rbf/Makefile \
-        usrp/fpga/rbf/rev2/Makefile \
-        usrp/fpga/rbf/rev4/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(usrp)
-])
diff --git a/config/grc_usrp2.m4 b/config/grc_usrp2.m4
deleted file mode 100644
index 701b100ad..000000000
--- a/config/grc_usrp2.m4
+++ /dev/null
@@ -1,81 +0,0 @@
-dnl Copyright 2008,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_USRP2],[
-    GRC_ENABLE(usrp2)
-
-    dnl firmware uses a subsidiary configure.ac
-    AC_CONFIG_SUBDIRS([usrp2/firmware])
-
-    dnl Don't do usrp if gruel is skipped
-    GRC_CHECK_DEPENDENCY(usrp2, gruel)
-
-    dnl USRP2 host code only works on Linux at the moment
-    AC_MSG_CHECKING([whether host_os is linux*])
-    case "$host_os" in
-      linux*)
-	AC_MSG_RESULT([yes])
-        ;;
-      *)
-	AC_MSG_RESULT([no])
-	AC_MSG_NOTICE([USRP2 currently requires Linux host OS, not found])
-        passed="no"
-        ;;
-    esac
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed = yes; then
-	dnl Needed for usrp2_socket_opener
-	AC_CHECK_HEADERS(arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.h)
-	AC_CHECK_MEMBERS([struct msghdr.msg_control,
-			  struct msghdr.msg_accrights,
-			  struct cmsgcred.cmcred_uid,
-			  struct ucred.uid],
-        	         [],[],
-			 [#define __USE_GNU 1
-			  #include <sys/types.h>
-		          #include <sys/socket.h>
-			  #include <sys/un.h>])
-    fi
-    if test $passed != with; then
-	dnl how and where to find INCLUDES and LA
-	USRP2_INCLUDES="-I\${abs_top_srcdir}/usrp2/host/include \
-		-I\${abs_top_srcdir}/usrp2/firmware/include"
-        USRP2_LA="\${abs_top_builddir}/usrp2/host/lib/libusrp2.la"
-    fi
-
-    dnl Include the usrp2 INCLUDES and LA
-    AC_SUBST(USRP2_INCLUDES)
-    AC_SUBST(USRP2_LA)
-
-    AC_CONFIG_FILES([ \
-        usrp2/Makefile
-        usrp2/host/Makefile \
-        usrp2/host/usrp2.pc \
-        usrp2/host/include/Makefile
-        usrp2/host/include/usrp2/Makefile
-        usrp2/host/lib/Makefile
-        usrp2/host/apps/Makefile
-    ])
-
-    GRC_BUILD_CONDITIONAL(usrp2)
-])
diff --git a/config/grc_volk.m4 b/config/grc_volk.m4
deleted file mode 100644
index f349d5e99..000000000
--- a/config/grc_volk.m4
+++ /dev/null
@@ -1,43 +0,0 @@
-dnl Copyright 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_VOLK],[
-    GRC_ENABLE(volk)
-    GRC_WITH(volk)
-
-    dnl If execution gets to here, test if $passed is:
-    dnl   with : if the --with code didn't error out, use these values
-    dnl Test if $enable_volk is:
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise, then do not set variables
-    if test $passed != with && test x$enable_volk == xyes; then
-    	dnl how and where to find INCLUDES and LA
-	volk_INCLUDES="-I\${abs_top_srcdir}/volk/include"
-	volk_LA="\${abs_top_builddir}/volk/lib/libvolk.la \
-	         \${abs_top_builddir}/volk/lib/libvolk_runtime.la"
-    fi
-
-    dnl volk uses a subsidiary configure.ac
-    dnl only run if building Volk
-    if test $passed == yes && test x$enable_volk != xno; then
-	AC_CONFIG_SUBDIRS([volk])
-    fi
-
-    GRC_BUILD_CONDITIONAL(volk, [])
-])
diff --git a/config/lf_cc.m4 b/config/lf_cc.m4
deleted file mode 100644
index b75e1a4c5..000000000
--- a/config/lf_cc.m4
+++ /dev/null
@@ -1,41 +0,0 @@
-dnl Autoconf support for C++
-dnl Copyright (C) 1988 Eleftherios Gkioulekas <lf@amath.washington.edu>
-dnl  
-dnl This program 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 of the License, or
-dnl (at your option) any later version.
-dnl 
-dnl This program 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 this program; if not, write to the Free Software 
-dnl Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.
-dnl 
-dnl As a special exception to the GNU General Public License, if you 
-dnl distribute this file as part of a program that contains a configuration 
-dnl script generated by Autoconf, you may include it under the same 
-dnl distribution terms that you use for the rest of that program.
-
-# -------------------------------------------------------------------------
-# Use this macro to configure your C compiler
-# When called the macro does the following things:
-# 1. It finds an appropriate C compiler.
-#    If you passed the flag --with-cc=foo then it uses that
-#    particular compiler
-# 2. Check whether the compiler works.
-# 3. Checks whether the compiler accepts the -g 
-# -------------------------------------------------------------------------
-
-AC_DEFUN([LF_CONFIGURE_CC],[
-  dnl Sing the song
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_PROG_CPP])dnl
-  AC_REQUIRE([AC_AIX])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-])
-
diff --git a/config/lf_cxx.m4 b/config/lf_cxx.m4
deleted file mode 100644
index 7cce5f8a4..000000000
--- a/config/lf_cxx.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-dnl Autoconf support for C++
-dnl Copyright (C) 1988 Eleftherios Gkioulekas <lf@amath.washington.edu>
-dnl  
-dnl This program 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 of the License, or
-dnl (at your option) any later version.
-dnl 
-dnl This program 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 this program; if not, write to the Free Software 
-dnl Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.
-dnl 
-dnl As a special exception to the GNU General Public License, if you 
-dnl distribute this file as part of a program that contains a configuration 
-dnl script generated by Autoconf, you may include it under the same 
-dnl distribution terms that you use for the rest of that program.
-
-# -----------------------------------------------------------------
-# This macro should be called to configure your C++ compiler.
-# When called, the macro does the following things:
-# 1. It finds an appropriate C++ compiler
-#    If you passed the flag --with-cxx=foo, then it uses that
-#    particular compiler
-# 2. Checks whether the compiler accepts the -g 
-# ------------------------------------------------------------------
-
-AC_DEFUN([LF_CONFIGURE_CXX],[
- AC_REQUIRE([AC_PROG_CXX])dnl
- AC_REQUIRE([AC_PROG_CXXCPP])dnl
- LF_CXX_PORTABILITY
-])
-
-# -----------------------------------------------------------------------
-# This macro tests the C++ compiler for various portability problem.
-# -----------------------------------------------------------------------
-
-
-AC_DEFUN([LF_CXX_PORTABILITY],[
-
-  dnl
-  dnl Check for common C++ portability problems
-  dnl
-
-])
-
diff --git a/config/lf_warnings.m4 b/config/lf_warnings.m4
deleted file mode 100644
index d40c77f14..000000000
--- a/config/lf_warnings.m4
+++ /dev/null
@@ -1,121 +0,0 @@
-dnl Copyright (C) 1988 Eleftherios Gkioulekas <lf@amath.washington.edu>
-dnl Copyright (C) 2009 Free Software Foundation, Inc.
-dnl  
-dnl This program 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 of the License, or
-dnl (at your option) any later version.
-dnl 
-dnl This program 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 this program; if not, write to the Free Software 
-dnl Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.
-dnl 
-dnl As a special exception to the GNU General Public License, if you 
-dnl distribute this file as part of a program that contains a configuration 
-dnl script generated by Autoconf, you may include it under the same 
-dnl distribution terms that you use for the rest of that program.
-
-# --------------------------------------------------------------------------
-# Check whether the C++ compiler accepts a certain flag
-# If it does it adds the flag to lf_CXXFLAGS
-# If it does not then it returns an error to lf_ok
-# Usage:
-#   LF_CHECK_CXX_FLAG(-flag1 -flag2 -flag3 ...)
-# -------------------------------------------------------------------------
-
-AC_DEFUN([LF_CHECK_CXX_FLAG],[
-  echo 'void f(){}' > conftest.cc
-  for i in $1
-  do
-    AC_MSG_CHECKING([whether $CXX accepts $i])
-    if test -z "`${CXX} $i -c conftest.cc 2>&1`"
-    then
-      lf_CXXFLAGS="${lf_CXXFLAGS} $i"
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
-  done
-  rm -f conftest.cc conftest.o
-  AC_SUBST(lf_CXXFLAGS)
-])
-
-# --------------------------------------------------------------------------
-# Check whether the C compiler accepts a certain flag
-# If it does it adds the flag to lf_CFLAGS
-# If it does not then it returns an error to lf_ok
-# Usage:
-#  LF_CHECK_CC_FLAG(-flag1 -flag2 -flag3 ...)
-# -------------------------------------------------------------------------
-
-AC_DEFUN([LF_CHECK_CC_FLAG],[
-  echo 'void f(){}' > conftest.c
-  for i in $1
-  do
-    AC_MSG_CHECKING([whether $CC accepts $i])
-    if test -z "`${CC} $i -c conftest.c 2>&1`"
-    then
-      lf_CFLAGS="${lf_CFLAGS} $i"
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
-  done
-  rm -f conftest.c conftest.o
-  AC_SUBST(lf_CFLAGS)
-])
-
-# --------------------------------------------------------------------------
-# Check whether the Fortran compiler accepts a certain flag
-# If it does it adds the flag to lf_FFLAGS
-# If it does not then it returns an error to lf_ok
-# Usage:
-#  LF_CHECK_F77_FLAG(-flag1 -flag2 -flag3 ...)
-# -------------------------------------------------------------------------
-
-AC_DEFUN([LF_CHECK_F77_FLAG],[
-  cat << EOF > conftest.f
-c....:++++++++++++++++++++++++
-      PROGRAM MAIN
-      PRINT*,'Hello World!'
-      END
-EOF
-  for i in $1
-  do
-    AC_MSG_CHECKING([whether $F77 accepts $i])
-    if test -z "`${F77} $i -c conftest.f 2>&1`"
-    then
-      lf_FFLAGS="${lf_FFLAGS} $i"
-      AC_MSG_RESULT(yes)  
-    else
-      AC_MSG_RESULT(no)
-    fi
-  done
-  rm -f conftest.f conftest.o
-  AC_SUBST(lf_FFLAGS)
-])
-
-# ----------------------------------------------------------------------
-# Enable compiler warnings. 
-# Call this command AFTER you have configured ALL your compilers. 
-# ----------------------------------------------------------------------
-
-AC_DEFUN([LF_SET_WARNINGS],[
-  dnl Warnings for the two main compilers
-  dnl add -Wextra when you're got time to fix a bunch of them ;-)
-  cc_warning_flags="-Wall -Werror-implicit-function-declaration"
-  cxx_warning_flags="-Wall -Woverloaded-virtual"
-  if test -n "${CC}"
-  then
-    LF_CHECK_CC_FLAG($cc_warning_flags)
-  fi
-  if test -n "${CXX}" 
-  then
-    LF_CHECK_CXX_FLAG($cxx_warning_flags)
-  fi
-])
diff --git a/config/lf_x11.m4 b/config/lf_x11.m4
deleted file mode 100644
index 460cd605f..000000000
--- a/config/lf_x11.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-dnl Copyright (C) 1988 Eleftherios Gkioulekas <lf@amath.washington.edu>
-dnl  
-dnl This program 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 of the License, or
-dnl (at your option) any later version.
-dnl 
-dnl This program 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 this program; if not, write to the Free Software 
-dnl Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.
-dnl 
-dnl As a special exception to the GNU General Public License, if you 
-dnl distribute this file as part of a program that contains a configuration 
-dnl script generated by Autoconf, you may include it under the same 
-dnl distribution terms that you use for the rest of that program.
-
- 
-#-----------------------------------------------------------------------
-# This macro searches for Xlib and when it finds it it adds the 
-# appropriate flags to CXXFLAGS and export the link sequence to 
-# the variable XLIB. 
-# In your configure.in file add:
-#   LF_PATH_XLIB
-# In your Makefile.am add
-#   program_LDADD = .... $(XLIB)
-#------------------------------------------------------------------------
-
-AC_DEFUN([LF_PATH_XLIB],[
-  AC_PATH_XTRA
-  CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-  XLIB="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-  AC_SUBST(XLIB)
-])
-
diff --git a/config/macosx_audiounit.m4 b/config/macosx_audiounit.m4
deleted file mode 100644
index ee179d761..000000000
--- a/config/macosx_audiounit.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2006 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Boston, MA
-# 02110-1301, USA.
-
-AC_DEFUN([MACOSX_AUDIOUNIT],
-[
-    audiounitok=yes
-    case "$host_os" in
-    	darwin*);;
-    	*) 
-	   audiounitok=no
-	   AC_MSG_RESULT([gr-audio-osx requires darwin or MacOS X.])
-    esac
-
-    AC_CHECK_HEADERS([AudioUnit/AudioUnit.h],[],
-	  [audiounitok=no;AC_MSG_RESULT([gr-audio-osx requires AudioUnit/AudioUnit.h, which is available on MacOS X.])])
-
-    AC_CHECK_HEADERS([AudioToolbox/AudioToolbox.h],[],
-	  [audiounitok=no;AC_MSG_RESULT([gr-audio-osx requires AudioToolbox/AudioToolbox.h, which is available on MacOS X.])])    
-
-    if test $audiounitok = yes; then
-        ifelse([$1], , :, [$1])
-    else
-        ifelse([$2], , :, [$2])
-    fi
-])
diff --git a/config/mkstemp.m4 b/config/mkstemp.m4
deleted file mode 100644
index 2d1fbee9b..000000000
--- a/config/mkstemp.m4
+++ /dev/null
@@ -1,78 +0,0 @@
-#serial 4
-
-# On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
-# silly limit that it can create no more than 26 files from a given template.
-# Other systems lack mkstemp altogether.
-# On OSF1/Tru64 V4.0F, the system-provided mkstemp function can create
-# only 32 files per process.
-# On systems like the above, arrange to use the replacement function.
-AC_DEFUN([UTILS_FUNC_MKSTEMP],
-[dnl
-  AC_REPLACE_FUNCS(mkstemp)
-  if test $ac_cv_func_mkstemp = no; then
-    utils_cv_func_mkstemp_limitations=yes
-  else
-    AC_CACHE_CHECK([for mkstemp limitations],
-      utils_cv_func_mkstemp_limitations,
-      [
-	AC_TRY_RUN([
-#         include <stdlib.h>
-	  int main ()
-	  {
-	    int i;
-	    for (i = 0; i < 70; i++)
-	      {
-		char template[] = "conftestXXXXXX";
-		int fd = mkstemp (template);
-		if (fd == -1)
-		  exit (1);
-		close (fd);
-	      }
-	    exit (0);
-	  }
-	  ],
-	utils_cv_func_mkstemp_limitations=no,
-	utils_cv_func_mkstemp_limitations=yes,
-	utils_cv_func_mkstemp_limitations=yes
-	)
-      ]
-    )
-  fi
-
-  if test $utils_cv_func_mkstemp_limitations = yes; then
-    AC_LIBOBJ(mkstemp)
-    AC_LIBOBJ(tempname)
-    AC_DEFINE(mkstemp, rpl_mkstemp,
-      [Define to rpl_mkstemp if the replacement function should be used.])
-    gl_PREREQ_MKSTEMP
-    jm_PREREQ_TEMPNAME
-  fi
-])
-
-# Prerequisites of lib/mkstemp.c.
-AC_DEFUN([gl_PREREQ_MKSTEMP],
-[
-  AH_BOTTOM(
-  [
-  #ifndef HAVE_MKSTEMP
-  #ifdef  __cplusplus
-  extern "C" {
-  #endif
-  int rpl_mkstemp (char *templ);
-  #ifdef  __cplusplus
-  }
-  #endif
-  #endif
-  ])
-])
-
-# Prerequisites of lib/tempname.c.
-AC_DEFUN([jm_PREREQ_TEMPNAME],
-[
-  AC_REQUIRE([AC_HEADER_STAT])
-  AC_CHECK_HEADERS_ONCE(fcntl.h sys/time.h unistd.h)
-  AC_CHECK_HEADERS(stdint.h)
-  AC_CHECK_FUNCS(__secure_getenv gettimeofday lstat)
-  AC_CHECK_DECLS_ONCE(getenv)
-  # AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
-])
diff --git a/config/onceonly.m4 b/config/onceonly.m4
deleted file mode 100644
index f6fec37cb..000000000
--- a/config/onceonly.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-# onceonly.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl This file defines some "once only" variants of standard autoconf macros.
-dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS
-dnl   AC_CHECK_FUNCS_ONCE           like  AC_CHECK_FUNCS
-dnl   AC_CHECK_DECLS_ONCE           like  AC_CHECK_DECLS
-dnl   AC_REQUIRE([AC_HEADER_STDC])  like  AC_HEADER_STDC
-dnl The advantage is that the check for each of the headers/functions/decls
-dnl will be put only once into the 'configure' file. It keeps the size of
-dnl the 'configure' file down, and avoids redundant output when 'configure'
-dnl is run.
-dnl The drawback is that the checks cannot be conditionalized. If you write
-dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
-dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
-dnl empty, and the check will be inserted before the body of the AC_DEFUNed
-dnl function.
-
-dnl Autoconf version 2.57 or newer is recommended.
-AC_PREREQ(2.54)
-
-# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
-# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
-AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
-  :
-  AC_FOREACH([gl_HEADER_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
-                                                 [-./], [___])), [
-      AC_CHECK_HEADERS(gl_HEADER_NAME)
-    ])
-    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
-                                                   [-./], [___])))
-  ])
-])
-
-# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
-# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
-AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
-  :
-  AC_FOREACH([gl_FUNC_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
-      AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
-    ])
-    AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
-  ])
-])
-
-# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
-# AC_CHECK_DECLS(DECL1, DECL2, ...).
-AC_DEFUN([AC_CHECK_DECLS_ONCE], [
-  :
-  AC_FOREACH([gl_DECL_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
-      AC_CHECK_DECLS(defn([gl_DECL_NAME]))
-    ])
-    AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
-  ])
-])
diff --git a/config/pkg.m4 b/config/pkg.m4
deleted file mode 100644
index 2d4d96109..000000000
--- a/config/pkg.m4
+++ /dev/null
@@ -1,201 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-# Copyright © 2008 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.18])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-# E.g.,
-#   PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-#   defines:
-#
-#     GSTUFF_LIBS
-#     GSTUFF_CFLAGS
-#     GSTUFF_INCLUDEDIR
-#     GSTUFF_CPPFLAGS    # the -I, -D and -U's out of CFLAGS
-#
-# see pkg-config man page also defines GSTUFF_PKG_ERRORS on error
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],[
-AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_INCLUDEDIR], [includedir for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-
-if test x$cross_compiling = xyes
-then
-  dnl _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2])
-  _PKG_CONFIG([$1][_LIBS], [libs --static], [$2])
-  dnl prune out any -L/lib or -L/usr/lib since they're pointing to the wrong filesystem root
-  _pkg_tmp=
-  for flag in [$]pkg_cv_[$1][_LIBS]; do
-    case $flag in
-    (-L/lib* | -L/usr/lib* )	   ;; # ignore
-    (*) _pkg_tmp="$_pkg_tmp $flag" ;;
-    esac
-  done
-  pkg_cv_[$1][_LIBS]="$_pkg_tmp"
-else
-  _PKG_CONFIG([$1][_LIBS], [libs --static], [$2])
-fi
-
-_PKG_CONFIG([$1][_INCLUDEDIR], [variable=includedir], [$2])
-
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-	$1[]_INCLUDEDIR=$pkg_cv_[]$1[]_INCLUDEDIR
-
-	$1[]_CPPFLAGS=""
-	for flag in $$1[]_CFLAGS; do
-	  case $flag in
-          -I* | -D* | -U*) $1[]_CPPFLAGS="$$1[]_CPPFLAGS $flag" ;;
-          esac
-        done
-	pkg_cv_[]$1[]_CPPFLAGS=$$1[]_CPPFLAGS
-	AC_SUBST($1[]_CPPFLAGS)
-
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
diff --git a/config/sdl.m4 b/config/sdl.m4
deleted file mode 100644
index 20ad7df35..000000000
--- a/config/sdl.m4
+++ /dev/null
@@ -1,176 +0,0 @@
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-dnl
-AC_DEFUN([AM_PATH_SDL],
-[dnl 
-dnl Get the cflags and libraries from the sdl-config script
-dnl
-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
-            sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
-AC_ARG_ENABLE(sdltest, AC_HELP_STRING([--disable-sdltest],
-                                      [Do not try to compile and run a test SDL program]),
-              [], enable_sdltest=yes)
-
-  if test x$sdl_exec_prefix != x ; then
-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-     fi
-  fi
-  if test x$sdl_prefix != x ; then
-     sdl_args="$sdl_args --prefix=$sdl_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
-     fi
-  fi
-
-  AC_REQUIRE([AC_CANONICAL_TARGET])
-  TMP_PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$TMP_PATH])
-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-  no_sdl=""
-  if test "$SDL_CONFIG" = "no" ; then
-    no_sdl=yes
-  else
-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-
-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_sdltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $SDL_CFLAGS"
-      LIBS="$LIBS $SDL_LIBS"
-dnl
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
-dnl
-      rm -f conf.sdltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.sdltest");
-  */
-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_sdl_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_sdl_version");
-     exit(1);
-   }
-
-   if (($sdl_major_version > major) ||
-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_sdl" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$SDL_CONFIG" = "no" ; then
-       echo "*** The sdl-config script installed by SDL could not be found"
-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
-       echo "*** full path to sdl-config."
-     else
-       if test -f conf.sdltest ; then
-        :
-       else
-          echo "*** Could not run SDL test program, checking why..."
-          CFLAGS="$CFLAGS $SDL_CFLAGS"
-          LIBS="$LIBS $SDL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     SDL_CFLAGS=""
-     SDL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(SDL_CFLAGS)
-  AC_SUBST(SDL_LIBS)
-  rm -f conf.sdltest
-])
diff --git a/config/usrp_fusb_tech.m4 b/config/usrp_fusb_tech.m4
deleted file mode 100644
index b99cf2432..000000000
--- a/config/usrp_fusb_tech.m4
+++ /dev/null
@@ -1,87 +0,0 @@
-dnl
-dnl Copyright 2003,2008,2009 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 
-
-# $1 is $enable_usrp:
-#   yes : do these tests
-#   no  : do not do these tests
-#   ""  : do these tests
-
-AC_DEFUN([USRP_SET_FUSB_TECHNIQUE],[
-  req_libusb1=no
-  USE_LIBUSB1=0
-  AC_ARG_WITH([fusb-tech],
-              AC_HELP_STRING([--with-fusb-tech=OS],
-		             [Set fast USB technique (default=auto)]),
-	      [cf_with_fusb_tech="$withval"],
-	      [cf_with_fusb_tech="$host_os"])
-  if test [x]$1 != xno; then
-      case "$cf_with_fusb_tech" in
-        libusb1*)
-          FUSB_TECH=libusb1
-          req_libusb1=yes
-	  USE_LIBUSB1=1
-          ;;
-        linux*)
-          AC_CHECK_HEADER([linux/usbdevice_fs.h],
-	                  [x_have_usbdevice_fs_h=yes],
-                          [x_have_usbdevice_fs_h=no])
-          if test x${x_have_usbdevice_fs_h} = xyes; then
-              FUSB_TECH=linux
-          else
-              FUSB_TECH=generic
-          fi
-          ;;
-        darwin*)
-          FUSB_TECH=darwin
-          ;;
-        cygwin*|win*|mingw*)
-          FUSB_TECH=win32
-          ;;
-        *bsd*)
-          AC_MSG_CHECKING([for RA/WB])
-          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dev/usb/usb.h>]],
-					     [[struct usb_bulk_ra_wb_opt o;
-					       ioctl(0, USB_SET_BULK_RA, &o);]])],
-			    [FUSB_TECH=ra_wb],
-			    [FUSB_TECH=generic])
-          ;;
-        *)
-          FUSB_TECH=generic
-          ;;
-      esac
-
-      AC_MSG_CHECKING([for fast usb technique to use])
-      AC_MSG_RESULT($FUSB_TECH)
-      AC_SUBST(FUSB_TECH)
-  fi
-
-  AM_CONDITIONAL(FUSB_TECH_darwin,   test x$FUSB_TECH = xdarwin)
-  AM_CONDITIONAL(FUSB_TECH_win32,    test x$FUSB_TECH = xwin32)
-  AM_CONDITIONAL(FUSB_TECH_generic,  test x$FUSB_TECH = xgeneric)
-  AM_CONDITIONAL(FUSB_TECH_linux,    test x$FUSB_TECH = xlinux)
-  AM_CONDITIONAL(FUSB_TECH_libusb1,  test x$FUSB_TECH = xlibusb1)
-  AM_CONDITIONAL(FUSB_TECH_ra_wb,    test x$FUSB_TECH = xra_wb)
-
-  AC_SUBST(USE_LIBUSB1)
-  AC_CONFIG_FILES([\
-	usrp/host/include/usrp/libusb_types.h \
-  ])
-])
diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
deleted file mode 100644
index cc3410f41..000000000
--- a/config/usrp_libusb.m4
+++ /dev/null
@@ -1,273 +0,0 @@
-dnl Copyright 2003,2008,2009 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.
-
-# $1 is $req_libusb1:
-#   yes : check libusb-1.0
-#   no  : check libusb-0.12
-#   ""  : check libusb-0.12
-
-
-AC_DEFUN([USRP_LIBUSB], [
-  dnl do not use LDFLAGS, except on Windows
-  saved_LDFLAGS=${LDFLAGS}
-  case "$host_os" in
-    cygwin* | mingw*)
-    ;;
-    *)
-      LDFLAGS=
-    ;;
-  esac
-
-  dnl this variable is set in usrp/usrp.pc.in as a requirement
-  dnl for libusrp; it is OK to be empty.
-  LIBUSB_PKG_CONFIG_NAME=
-
-  dnl for Windows (cygin, mingw), do not use PKGCONFIG since LIBUSB
-  dnl does not install a .pc file.  For all other OSs, use
-  dnl PKGCONFIG to check for various package names first.
-  libusb_list=''
-  case "$host_os" in
-    cygwin* | mingw*)
-      libusb_list='libusb'
-    ;;
-    *)
-      dnl create the list of libusb PKGCONFIG modules to test
-      if test x$1 = xyes; then
-        dnl libusb-1.0 was requested; just test for it
-        libusb_list="libusb-1.0"
-      else
-        dnl test for legacy libusb only
-        libusb_list="libusb libusb-legacy"
-      fi
-    ;;
-  esac
-
-  dnl loop over various possible 'libusb' names, and
-  dnl choose the first one that meets both the user's selection
-  dnl (via configure flags) as well as what is installed
-  for libusb_name in ${libusb_list}; do
-    dnl clear internal variables
-    libusbok=no
-    have_libusb1=no
-    usb_header=''
-    usb_lib_func=''
-    usb_lib_name=''
-
-    case "$host_os" in
-      cygwin* | mingw*)
-        USB_INCLUDEDIR=
-        USB_INCLUDES=
-        USB_LIBS=-lusb
-        usb_header='usb.h'
-        usb_lib_func='usb_bulk_write'
-        libusbok=yes
-      ;;
-      *)
-        dnl start checks
-        AC_MSG_NOTICE([Checking for LIBUSB version '${libusb_name}'])
-        if test ${libusb_name} = "libusb-1.0"; then
-          dnl see if the pkgconfig module is available
-          PKG_CHECK_MODULES(USB, ${libusb_name}, [
-            libusbok=yes
-            have_libusb1=yes
-            usb_header='libusb-1.0/libusb.h'
-            usb_lib_func='libusb_bulk_transfer'
-          ], [libusbok=no])
-        else
-          dnl see if the pkgconfig module is available
-          PKG_CHECK_MODULES(USB, ${libusb_name}, [
-            libusbok=yes
-            usb_header='usb.h'
-            usb_lib_func='usb_bulk_write'
-          ], [libusbok=no])
-        fi
-      ;;
-    esac
-    if test $libusbok = yes; then
-      dnl PKGCONFIG found a version of LIBUSB, or the info was
-      dnl provided by the user, or the OS is Windows.
-
-      dnl Check it to make sure it meets enough criteria:
-      dnl Verify that $usb_header is a valid header. If so, then
-      dnl verify that $usb_lib_func can be found in the library
-      dnl $usb_lib_name.  if so, verify that the symbol 'usb_debug' is
-      dnl found in the library if not using Windows.
-
-      dnl Check for the header.  Similar to AC_CHECK_HEADERS,
-      dnl but doesn't append to known \#defines.
-      dnl If PKGCONFIG found variable USB_INCLUDEDIR, and it is
-      dnl not empty, use it for checking for $usb_header.
-      dnl Otherwise, maybe the user's shell environment is already
-      dnl configured to find this header.
-      AC_LANG_PUSH(C)
-      save_CPPFLAGS="$CPPFLAGS"
-      if test x$USB_INCLUDEDIR != x; then
-        USB_INCLUDES="-I$USB_INCLUDEDIR"
-        CPPFLAGS="$USB_INCLUDES"
-      fi
-      AC_MSG_CHECKING([$libusb_name for header $usb_header])
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-        #include "$usb_header"
-        ]], [])],
-        [libusbok=yes],[libusbok=no])
-      AC_MSG_RESULT([$libusbok])
-      CPPFLAGS="$save_CPPFLAGS"
-      AC_LANG_POP(C)
-
-      if test $libusbok = yes; then
-        dnl found the header; now make sure the library is OK
-        dnl On Darwin, need to include the IOKit library.     
-
-        AC_LANG_PUSH(C)
-        save_LIBS="$LIBS"
-        case "$host_os" in
-          darwin*)
-            USB_LIBS="$USB_LIBS -lIOKit"
-            ;;
-          *) ;;
-        esac
-        LIBS="$USB_LIBS"
-
- 	dnl find the library link name
-        usb_lib_name=`echo $USB_LIBS | sed -e "s@.*-l\(usb[[^ ]]*\).*@\1@"`
-
-        dnl Check for the function in the library.  Similar to
-        dnl AC_CHECK_LIB, but doesn't append to known \#defines.
-        AC_MSG_CHECKING([$libusb_name for function $usb_lib_func in library $usb_lib_name])
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-          #ifdef __cplusplus
-          extern "C"
-          #endif
-          char $usb_lib_func ();
-          ]], [[return $usb_lib_func ();]])],
-          [libusbok=yes],[libusbok=no])
-        AC_MSG_RESULT([$libusbok])
-        LIBS="$save_LIBS"
-        AC_LANG_POP(C)
-
-        if test $libusbok = yes; then
-          if test ${libusb_name} != "libusb-1.0"; then
-            dnl PKGCONFIG found a legacy version of libusb; make sure the
-            dnl variable _usb_debug is available in the found library.
-	    dnl Do not test on Windows, since that symbol is not defined.
-            case "$host_os" in
-              cygwin* | mingw*)
-              ;;
-            *)
-              AC_LANG_PUSH(C)
-              save_CPPFLAGS="$CPPFLAGS"
-              if test x$USB_INCLUDEDIR != x; then
-                CPPFLAGS="$USB_INCLUDES"
-              fi
-              save_LIBS="$LIBS"
-              LIBS="$USB_LIBS"
-              AC_MSG_CHECKING([$libusb_name for symbol usb_debug in library $usb_lib_name])
-              AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-                extern int usb_debug;]],
-                [[usb_debug = 0;]])],
-                [libusbok=yes],[libusbok=no])
-              AC_MSG_RESULT([$libusbok])
-              LIBS="$save_LIBS"
-              CPPFLAGS="$save_CPPFLAGS"
-              AC_LANG_POP(C)
-              ;;
-            esac
-          fi
-        fi
-      fi
-    fi
-    dnl if everything checks out OK, finish up
-    if test $libusbok = yes; then
-      case "$host_os" in
-        cygwin* | mingw*)
-        ;;
-        *)
-          LIBUSB_PKG_CONFIG_NAME="${libusb_name}"
-        ;;
-      esac
-      break
-    else
-      dnl something wasn't found in this LIBUSB version.
-      dnl HACK: clear cache variables for header and library
-      unset USB_INCLUDEDIR
-      unset USB_INCLUDES
-      unset USB_LIBS
-      unset $as_ac_Header
-      unset $as_ac_Lib
-    fi
-  done
-
-  if test $libusbok = yes; then
-    dnl final error checking, mostly to create #define's
-    AC_LANG_PUSH(C)
-    save_CPPFLAGS="$CPPFLAGS"
-    if test x$USB_INCLUDEDIR != x; then
-      CPPFLAGS="$USB_INCLUDES"
-    fi
-    dnl Check for the header.
-    AC_CHECK_HEADERS([$usb_header], [], [libusbok=no])
-    CPPFLAGS="$save_CPPFLAGS"
-    AC_LANG_POP(C)
-
-    if test $libusbok = no; then
-      AC_MSG_RESULT([USRP requires libusb header '$usb_header' which was not found or was not usable. See http://www.libusb.org])
-    else
-      dnl check for the library (again)
-      AC_LANG_PUSH(C)
-      save_CPPFLAGS="$CPPFLAGS"
-      if test x$USB_INCLUDEDIR != x; then
-        CPPFLAGS="$USB_INCLUDES"
-      fi
-      save_LIBS="$LIBS"
-      LIBS="$USB_LIBS"
-      AC_CHECK_LIB([$usb_lib_name], [$usb_lib_func], [], [
-        libusbok=no
-        AC_MSG_RESULT([USRP requires library '$usb_lib_name' with function '$usb_lib_func', which was either not found or was not usable. See http://www.libusb.org])])
-#      case "$host_os" in
-#        cygwin* | mingw*)
-#          USB_LIBS="$LIBS"
-#          ;;
-#        *) ;;
-#      esac
-      LIBS="$save_LIBS"
-      CPPFLAGS="$save_CPPFLAGS"
-      AC_LANG_POP(C)
-    fi
-  fi
-
-  if test $libusbok = yes; then
-    dnl success
-    AC_MSG_NOTICE([Using LIBUSB version '${libusb_name}'])
-    ifelse([$2], , :, [$2])
-  else
-    dnl not found; clear substitution variables
-    LIBUSB_PKG_CONFIG_NAME=
-    USB_INCLUDES=
-    USB_LIBS=
-    ifelse([$3], , :, [$3])
-  fi
-
-  dnl create substitution variables
-  AC_SUBST(USB_INCLUDES)
-  AC_SUBST(USB_LIBS)
-  AC_SUBST(LIBUSB_PKG_CONFIG_NAME)
-
-  dnl restore LDFLAGS
-  LDFLAGS=${saved_LDFLAGS}
-])
diff --git a/config/usrp_sdcc.m4 b/config/usrp_sdcc.m4
deleted file mode 100644
index 3aae0bfa6..000000000
--- a/config/usrp_sdcc.m4
+++ /dev/null
@@ -1,75 +0,0 @@
-# Check for sdcc support.             		-*- Autoconf -*-
-
-# Copyright 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Boston, MA
-# 02110-1301, USA.
-
-AC_DEFUN([USRP_SDCC],
-[
-	sdccok=yes
-	AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no)
-	AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no)
-
-	if test "$XCC" = "no" -o "$XAS" = "no" ; then
-		AC_MSG_RESULT([USRP requires sdcc version 2. sdcc not found. See http://sdcc.sf.net])
-		sdccok=no
-	else
-		sdcc_version_min=$1
-
-		sdcc_version=`sdcc --version 2>&1 | \
-			sed  's/\(SDCC.* \)\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)\( .*$\)/\2/'`
-
-	        AC_MSG_CHECKING([sdcc_version "$sdcc_version"])
-
-		sdcc_major_version=`echo $sdcc_version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-		sdcc_minor_version=`echo $sdcc_version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-		sdcc_micro_version=`echo $sdcc_version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-		sdcc_major_min=`echo $sdcc_version_min | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-		sdcc_minor_min=`echo $sdcc_version_min | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-		sdcc_micro_min=`echo $sdcc_version_min | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-		sdcc_version_proper=`expr \
-			"$sdcc_major_version" \> "$sdcc_major_min" \| \
-			"$sdcc_major_version" \= "$sdcc_major_min" \& \
-	    		"$sdcc_minor_version" \> "$sdcc_minor_min" \| \
-			"$sdcc_major_version" \= "$sdcc_major_min" \& \
-			"$sdcc_minor_version" \= "$sdcc_minor_min" \& \
-			"$sdcc_micro_version" \>= "$sdcc_micro_min" `
-
-		if test "$sdcc_version_proper" = "1" ; then
-			AC_MSG_RESULT([$sdcc_major_version.$sdcc_minor_version.$sdcc_micro_version])
-		else
-			sdccok=no
-			AC_MSG_RESULT([USRP requires sdcc >= $sdcc_version_min. sdcc not found. See http://sdcc.sf.net])
-		fi
-
-		AC_SUBST(XCC)
-		AC_SUBST(XAS)
-	fi
-
-	if test $sdccok = yes; then
-		ifelse([$2], , :, [$2])
-	else
-		ifelse([$3], , :, [$3])
-	fi
-])