diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-17 13:32:04 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-17 13:32:18 +0200 |
| commit | c90111314435ab67808a89cac1a664cb19eafd61 (patch) | |
| tree | 8dee09135240e6b3e069b5feaafb23f2e8912664 | |
| parent | 53133c1c041d113c2a480a18e6ff38681d135dca (diff) | |
| parent | 6dd37237222f7102e223ece948150cb5c5087e3c (diff) | |
| download | bitcoin-c90111314435ab67808a89cac1a664cb19eafd61.tar.xz | |
Merge #8920: Set minimum required Boost to 1.47.0
6dd3723 Set minimum required Boost to 1.47.0 (fanquake)
282abd8 [build-aux] Boost_Base serial 27 (fanquake)
| -rw-r--r-- | build-aux/m4/ax_boost_base.m4 | 4 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/build-aux/m4/ax_boost_base.m4 b/build-aux/m4/ax_boost_base.m4 index 45d948933d..650c94fa64 100644 --- a/build-aux/m4/ax_boost_base.m4 +++ b/build-aux/m4/ax_boost_base.m4 @@ -33,7 +33,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 26 +#serial 27 AC_DEFUN([AX_BOOST_BASE], [ @@ -96,7 +96,7 @@ if test "x$want_boost" = "xyes"; then libsubdirs="lib64 libx32 lib lib64" ;; ppc64|s390x|sparc64|aarch64|ppc64le) - libsubdirs="lib64 lib lib64 ppc64le" + libsubdirs="lib64 lib lib64" ;; esac diff --git a/configure.ac b/configure.ac index 9ce10b7454..705327e816 100644 --- a/configure.ac +++ b/configure.ac @@ -589,8 +589,11 @@ fi if test x$use_boost = xyes; then +dnl Minimum required Boost version +define(MINIMUM_REQUIRED_BOOST, 1.47.0) + dnl Check for boost libs -AX_BOOST_BASE +AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST]) AX_BOOST_SYSTEM AX_BOOST_FILESYSTEM AX_BOOST_PROGRAM_OPTIONS |