diff options
| author | Tom Rondeau | 2011-02-01 23:19:28 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-02-01 23:19:28 -0500 |
| commit | 800686701206e438e5a5d645242137f9285c4fa9 (patch) | |
| tree | a95ad9bac09e3a6cec43f741cc3eab17771a2fe2 /volk/configure.ac | |
| parent | 023167ca8a85ab597f9e59302733f71809a8afbd (diff) | |
| parent | 6503e3b21978b71908400c994148836bec4a97b9 (diff) | |
| download | gnuradio-800686701206e438e5a5d645242137f9285c4fa9.tar.gz gnuradio-800686701206e438e5a5d645242137f9285c4fa9.tar.bz2 gnuradio-800686701206e438e5a5d645242137f9285c4fa9.zip | |
Merge branch 'volk_rename' into next
Conflicts:
volk/include/volk/Makefile.am
volk/lib/Makefile.am
volk/lib/qa_volk.cc
Diffstat (limited to 'volk/configure.ac')
| -rw-r--r-- | volk/configure.ac | 6 |
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 \ ]) |