Browse Source

Update `ax_boost_base.m4` to latest version

Upstream: https://github.com/autoconf-archive/autoconf-archive/blob/master/m4/ax_boost_base.m4
PR #17196.
adaptive-webui-19844
xavier2k6 2 years ago committed by GitHub
parent
commit
8e33d99901
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      configure
  2. 5
      m4/ax_boost_base.m4

4
configure vendored

@ -5741,7 +5741,7 @@ fi
libsubdirs="lib64 libx32 lib lib64" ;; #( libsubdirs="lib64 libx32 lib lib64" ;; #(
mips*64*) : mips*64*) :
libsubdirs="lib64 lib32 lib lib64" ;; #( libsubdirs="lib64 lib32 lib lib64" ;; #(
ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64) : ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k) :
libsubdirs="lib64 lib lib64" ;; #( libsubdirs="lib64 lib lib64" ;; #(
*) : *) :
libsubdirs="lib" libsubdirs="lib"
@ -5751,6 +5751,8 @@ esac
case ${host_cpu} in #( case ${host_cpu} in #(
i?86) : i?86) :
multiarch_libsubdir="lib/i386-${host_os}" ;; #( multiarch_libsubdir="lib/i386-${host_os}" ;; #(
armv7l) :
multiarch_libsubdir="lib/arm-${host_os}" ;; #(
*) : *) :
multiarch_libsubdir="lib/${host_cpu}-${host_os}" multiarch_libsubdir="lib/${host_cpu}-${host_os}"
;; ;;

5
m4/ax_boost_base.m4

@ -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 47 #serial 49
# example boost program (need to pass version) # example boost program (need to pass version)
m4_define([_AX_BOOST_BASE_PROGRAM], m4_define([_AX_BOOST_BASE_PROGRAM],
@ -114,7 +114,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
AS_CASE([${host_cpu}], AS_CASE([${host_cpu}],
[x86_64],[libsubdirs="lib64 libx32 lib lib64"], [x86_64],[libsubdirs="lib64 libx32 lib lib64"],
[mips*64*],[libsubdirs="lib64 lib32 lib lib64"], [mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
[ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64],[libsubdirs="lib64 lib lib64"], [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"],
[libsubdirs="lib"] [libsubdirs="lib"]
) )
@ -123,6 +123,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
dnl are almost assuredly the ones desired. dnl are almost assuredly the ones desired.
AS_CASE([${host_cpu}], AS_CASE([${host_cpu}],
[i?86],[multiarch_libsubdir="lib/i386-${host_os}"], [i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
[armv7l],[multiarch_libsubdir="lib/arm-${host_os}"],
[multiarch_libsubdir="lib/${host_cpu}-${host_os}"] [multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
) )

Loading…
Cancel
Save