aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-04-08 10:24:21 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-04-08 10:24:26 +0200
commita7101b13f7256588f609a97efc05dd27f29e8fec (patch)
tree805ede62730911663b6fedb2100fa05eeef93198 /src
parente448959dfbaff0adabc65fd609f8d1390ae4dc52 (diff)
parent13a2283a6d33fd844017fe8ab3ed660ea1eb7be7 (diff)
Merge pull request #4019
13a2283 build: Sync ax_boost_base.m4 with upstream. (Cory Fields)
Diffstat (limited to 'src')
-rw-r--r--src/m4/ax_boost_base.m48
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