Skip to content

Commit 85f0f93

Browse files
committed
build: sync ax_boost_base from upstream
I upstreamed our change, autoconf-archive/autoconf-archive#260, so sync with upstream. Slightly simplifies bitcoin#25465.
1 parent 604015a commit 85f0f93

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

build-aux/m4/ax_boost_base.m4

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
# Test for the Boost C++ libraries of a particular version (or newer)
1212
#
1313
# If no path to the installed boost library is given the macro searchs
14-
# under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates the
15-
# $BOOST_ROOT environment variable. Further documentation is available at
16-
# <http://randspringer.de/boost/index.html>.
14+
# under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates
15+
# the $BOOST_ROOT environment variable. Further documentation is available
16+
# at <http://randspringer.de/boost/index.html>.
1717
#
1818
# This macro calls:
1919
#
@@ -33,7 +33,7 @@
3333
# and this notice are preserved. This file is offered as-is, without any
3434
# warranty.
3535

36-
#serial 48
36+
#serial 51
3737

3838
# example boost program (need to pass version)
3939
m4_define([_AX_BOOST_BASE_PROGRAM],
@@ -114,7 +114,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
114114
AS_CASE([${host_cpu}],
115115
[x86_64],[libsubdirs="lib64 libx32 lib lib64"],
116116
[mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
117-
[ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64],[libsubdirs="lib64 lib lib64"],
117+
[ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"],
118118
[libsubdirs="lib"]
119119
)
120120
@@ -128,7 +128,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
128128
)
129129
130130
dnl first we check the system location for boost libraries
131-
dnl this location ist chosen if boost libraries are installed with the --layout=system option
131+
dnl this location is chosen if boost libraries are installed with the --layout=system option
132132
dnl or if you install boost with RPM
133133
AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[
134134
AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in "$_AX_BOOST_BASE_boost_path/include"])
@@ -151,7 +151,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
151151
else
152152
search_libsubdirs="$multiarch_libsubdir $libsubdirs"
153153
fi
154-
for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local /opt/homebrew/; do
154+
for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local /opt/homebrew ; do
155155
if test -d "$_AX_BOOST_BASE_boost_path_tmp/include/boost" && test -r "$_AX_BOOST_BASE_boost_path_tmp/include/boost" ; then
156156
for libsubdir in $search_libsubdirs ; do
157157
if ls "$_AX_BOOST_BASE_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi

0 commit comments

Comments
 (0)