diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-13 05:15:31 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-13 05:16:19 +0100 |
| commit | d670cdd6986d6fba6e44944b59d7baf90c8313fa (patch) | |
| tree | 510f21a7a59d078d86524762f797c8742424c89c | |
| parent | fb34be6d5905d36a2d9a392d87aa73bdb9470a1b (diff) | |
| parent | 952fe2ef32cccef9d1187620f5752359bd14e096 (diff) | |
| download | bitcoin-d670cdd6986d6fba6e44944b59d7baf90c8313fa.tar.xz | |
Merge pull request #3407
952fe2e docs: remove workaround instructions now that the problem is fixed (Cory Fields)
efdfee4 build: fix detection of boost libs on multi-arch distros (Cory Fields)
| -rw-r--r-- | doc/build-unix.md | 5 | ||||
| -rw-r--r-- | src/m4/ax_boost_base.m4 | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/build-unix.md b/doc/build-unix.md index b53d693424..704bc1f5c7 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -11,11 +11,6 @@ To Build This will build bitcoin-qt as well if the dependencies are met. -**Note:** on Ubuntu 13.10 (Saucy Salamander) the boost configuration script doesn't look in the -correct directory and an error about boost-system will appear. For now you need to do - - ./configure --with-boost-libdir=/usr/lib/x86_64-linux-gnu - Dependencies --------------------- 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 |