summaryrefslogtreecommitdiff
path: root/volk/configure.ac
diff options
context:
space:
mode:
authorBen Reynwar2011-02-27 13:46:47 -0700
committerBen Reynwar2011-02-27 13:46:47 -0700
commitc783c2f959ef53b75a279ce91ce23f68fd2566ae (patch)
treef351d567fb8b7016cf65746a4a3a28ce6193e787 /volk/configure.ac
parent315f45c234e2fa84fc83641c8404cc5fcdb8412e (diff)
parenta02bb131f68d5aa66093310c393562671e389778 (diff)
downloadgnuradio-c783c2f959ef53b75a279ce91ce23f68fd2566ae.tar.gz
gnuradio-c783c2f959ef53b75a279ce91ce23f68fd2566ae.tar.bz2
gnuradio-c783c2f959ef53b75a279ce91ce23f68fd2566ae.zip
Merge branch 'next' into constell_obj
Diffstat (limited to 'volk/configure.ac')
-rw-r--r--volk/configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/volk/configure.ac b/volk/configure.ac
index 7cbcbad53..c493adad6 100644
--- a/volk/configure.ac
+++ b/volk/configure.ac
@@ -18,7 +18,6 @@ dnl
AC_INIT
AC_PREREQ(2.57)
AC_CONFIG_AUX_DIR([.])
-AC_CONFIG_SRCDIR([lib/test_all.cc])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(volk,0.1)
@@ -44,7 +43,7 @@ dnl If you need additional boost libraries, you'll need to
dnl uncomment AX_BOOST_BASE, plus some of the following:
dnl
dnl calls AC_SUBST(BOOST_CPPFLAGS), AC_SUBST(BOOST_LDFLAGS) and defines HAVE_BOOST
-dnl AX_BOOST_BASE([1.35])
+AX_BOOST_BASE([1.35])
dnl
dnl All the rest of these call AC_SUBST(BOOST_<foo>_LIB) and define HAVE_BOOST_<foo>
dnl
@@ -57,7 +56,7 @@ dnl AX_BOOST_SERIALIZATION
dnl AX_BOOST_SIGNALS
dnl AX_BOOST_SYSTEM
dnl AX_BOOST_TEST_EXEC_MONITOR
-dnl AX_BOOST_UNIT_TEST_FRAMEWORK
+AX_BOOST_UNIT_TEST_FRAMEWORK
dnl AX_BOOST_WSERIALIZATION
AC_CONFIG_HEADERS([volk_config.h])
@@ -69,6 +68,7 @@ AC_CONFIG_FILES([\
include/Makefile \
include/volk/Makefile \
lib/Makefile \
+ orc/Makefile \
volk.pc \
])