diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2013-12-12 18:46:02 -0500 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2013-12-12 19:09:00 -0500 |
| commit | efdfee423f23df88ffa4b846e4522419fb081ce1 (patch) | |
| tree | b5b1aaa9fef25ee36c7db8299a42c2d8c8ea4f48 /src/m4 | |
| parent | fb34be6d5905d36a2d9a392d87aa73bdb9470a1b (diff) | |
| download | bitcoin-efdfee423f23df88ffa4b846e4522419fb081ce1.tar.xz | |
build: fix detection of boost libs on multi-arch distros
Fixes #3219.
Diffstat (limited to 'src/m4')
| -rw-r--r-- | src/m4/ax_boost_base.m4 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/m4/ax_boost_base.m4 b/src/m4/ax_boost_base.m4 index 57d14fe48d..c675f12d84 100644 --- a/src/m4/ax_boost_base.m4 +++ b/src/m4/ax_boost_base.m4 @@ -33,7 +33,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 21 +#serial 22 AC_DEFUN([AX_BOOST_BASE], [ @@ -97,6 +97,12 @@ if test "x$want_boost" = "xyes"; then ;; esac + dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give + dnl them priority over the other paths since, if libs are found there, they + dnl are almost assuredly the ones desired. + AC_REQUIRE([AC_CANONICAL_HOST]) + libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs" + dnl first we check the system location for boost libraries dnl this location ist chosen if boost libraries are installed with the --layout=system option dnl or if you install boost with RPM |