diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-04-07 13:15:26 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-04-07 13:19:01 -0400 |
| commit | 13a2283a6d33fd844017fe8ab3ed660ea1eb7be7 (patch) | |
| tree | 5fb7ee362d6a5ae1b22b7e8240554310f2047dd8 /src/m4 | |
| parent | f4e1c347cf1861595609ba841d35c4a59b50bde2 (diff) | |
| download | bitcoin-13a2283a6d33fd844017fe8ab3ed660ea1eb7be7.tar.xz | |
build: Sync ax_boost_base.m4 with upstream.
This should fix 32bit boost detection on Ubuntu Saucy+. Fixes #3945.
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 f941b27ec4..4f93a0e094 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 22 +#serial 23 AC_DEFUN([AX_BOOST_BASE], [ @@ -103,6 +103,12 @@ if test "x$want_boost" = "xyes"; then AC_REQUIRE([AC_CANONICAL_HOST]) libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs" + case ${host_cpu} in + i?86) + libsubdirs="lib/i386-${host_os} $libsubdirs" + ;; + esac + 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 |