Merge pull request #4019
13a2283
build: Sync ax_boost_base.m4 with upstream. (Cory Fields)
This commit is contained in:
commit
a7101b13f7
1 changed files with 7 additions and 1 deletions
|
@ -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 22
|
#serial 23
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_BASE],
|
AC_DEFUN([AX_BOOST_BASE],
|
||||||
[
|
[
|
||||||
|
@ -103,6 +103,12 @@ if test "x$want_boost" = "xyes"; then
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
|
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 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
|
||||||
|
|
Loading…
Reference in a new issue