summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Pöschel <github@basicmaster.de>2017-01-31 21:03:15 +0100
committerStefan Pöschel <github@basicmaster.de>2017-01-31 21:03:15 +0100
commitcb14b587504e2a754309199191daecf66ca58fae (patch)
tree0a415a76b49e236ba8af624af57d2e5b863142b0
parent0c888244d1e010e9327ee95af7b453b9832e0e65 (diff)
downloaddabmod-cb14b587504e2a754309199191daecf66ca58fae.tar.gz
dabmod-cb14b587504e2a754309199191daecf66ca58fae.tar.bz2
dabmod-cb14b587504e2a754309199191daecf66ca58fae.zip
Boost: unify version requirement to 1.54
Was 1.55, but this can lead to version conflicts on Ubuntu 14.04 LTS
-rw-r--r--INSTALL2
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/INSTALL b/INSTALL
index e0c7bd4..bf167bf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Required dependencies:
======================
* A C++11 capable compiler
- * Boost 1.41 or later
+ * Boost 1.54 or later
* FFTW 3.x
* Optional UHD for USRP
* Optional ZeroMQ http://www.zeromq.org
diff --git a/configure.ac b/configure.ac
index ed35cdd..f622471 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,7 @@ AS_IF([test "x$enable_output_uhd" = "xyes"],
AS_IF([test "x$enable_output_uhd" = "xyes"],
[AC_DEFINE(HAVE_OUTPUT_UHD, [1], [Define if UHD output is enabled])])
-AX_BOOST_BASE([1.55.0], [], AC_MSG_ERROR([BOOST 1.55 or later is required]))
+AX_BOOST_BASE([1.54.0], [], AC_MSG_ERROR([BOOST 1.54 or later is required]))
AC_CHECK_LIB([boost_system], [main], [], [AC_MSG_ERROR([library boost_system is missing])])
AC_CHECK_LIB([boost_thread], [main], [], [AC_MSG_ERROR([library boost_thread is missing])])