4 files changed, 5 insertions, 92 deletions
diff --git a/volk/config/Makefile.am b/volk/config/Makefile.am
index 27e3f1296..d4786f83a 100644
--- a/volk/config/Makefile.am
+++ b/volk/config/Makefile.am
@@ -30,7 +30,6 @@ m4macros = \
 	ax_boost_base.m4 \
 	ax_boost_unit_test_framework.m4 \
 	bnv_have_qt.m4 \
-	cppunit.m4 \
 	gr_lib64.m4 \
 	gr_libgnuradio_core_extra_ldflags.m4 \
 	gr_no_undefined.m4 \
@@ -43,7 +42,7 @@ m4macros = \
 	lf_cxx.m4 \
 	lf_warnings.m4 \
 	lf_x11.m4 \
-	lv_set_simd_flags.m4 \
+	$(top_gendir)/config/lv_set_simd_flags.m4 \
 	mkstemp.m4 \
 	onceonly.m4 \
 	pkg.m4 \
diff --git a/volk/config/cppunit.m4 b/volk/config/cppunit.m4
deleted file mode 100644
index 0991d51ec..000000000
--- a/volk/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/volk/config/lf_warnings.m4 b/volk/config/lf_warnings.m4
index d40c77f14..e62fb276c 100644
--- a/volk/config/lf_warnings.m4
+++ b/volk/config/lf_warnings.m4
@@ -29,7 +29,8 @@ dnl distribution terms that you use for the rest of that program.
 # -------------------------------------------------------------------------
 
 AC_DEFUN([LF_CHECK_CXX_FLAG],[
-  echo 'void f(){}' > conftest.cc
+  echo "#include <stdio.h>
+int main(int argc, char **argv){return 0;}" > conftest.cc
   for i in $1
   do
     AC_MSG_CHECKING([whether $CXX accepts $i])
@@ -54,7 +55,8 @@ AC_DEFUN([LF_CHECK_CXX_FLAG],[
 # -------------------------------------------------------------------------
 
 AC_DEFUN([LF_CHECK_CC_FLAG],[
-  echo 'void f(){}' > conftest.c
+  echo "#include <stdio.h>
+int main(int argc, char **argv){return 0;}" > conftest.c
   for i in $1
   do
     AC_MSG_CHECKING([whether $CC accepts $i])
diff --git a/volk/config/lv_configure.m4 b/volk/config/lv_configure.m4
index dfa490cdf..358fba030 100755..100644
--- a/volk/config/lv_configure.m4
+++ b/volk/config/lv_configure.m4
@@ -109,14 +109,6 @@ dnl  AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes])
   AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
   AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
 
-  dnl Define where to look for cppunit includes and libs
-  dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS
-  dnl Try using pkg-config first, then fall back to cppunit-config.
-  PKG_CHECK_EXISTS(cppunit,
-    [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)],
-    [AM_PATH_CPPUNIT([1.9.14],[],
-		     [AC_MSG_ERROR([VOLK requires cppunit.  Stop])])])
-
 dnl  PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3)
 dnl  LIBS="$LIBS $GNURADIO_CORE_LIBS"
 ])