zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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)
This commit is contained in:
Wladimir J. van der Laan 2013-12-13 05:15:31 +01:00
parent fb34be6d59 952fe2ef32
commit d670cdd698
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/build-unix.md
View File

@ -11,11 +11,6 @@ To Build
This will build bitcoin-qt as well if the dependencies are met. 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 Dependencies
--------------------- ---------------------

8
src/m4/ax_boost_base.m4
View File

@ -33,7 +33,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 21 #serial 22
AC_DEFUN([AX_BOOST_BASE], AC_DEFUN([AX_BOOST_BASE],
[ [
@ -97,6 +97,12 @@ if test "x$want_boost" = "xyes"; then
;; ;;
esac 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 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 this location ist chosen if boost libraries are installed with the --layout=system option
dnl or if you install boost with RPM dnl or if you install boost with RPM