From 071d7d2613dd472c3d77e40f21f4875364727184 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Mon, 7 Apr 2014 13:15:26 -0400 Subject: [PATCH] build: Sync ax_boost_base.m4 with upstream. This should fix 32bit boost detection on Ubuntu Saucy+. Fixes #3945. --- src/m4/ax_boost_base.m4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/m4/ax_boost_base.m4 b/src/m4/ax_boost_base.m4 index f941b27ec..4f93a0e09 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