Browse Source

Update m4 scripts

adaptive-webui-19844
Chocobo1 5 years ago
parent
commit
d0e084ce1d
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 7
      configure
  2. 5
      m4/ax_boost_base.m4
  3. 4
      m4/ax_boost_system.m4

7
configure vendored

@ -4182,7 +4182,6 @@ QBT_CXX="$CXX" @@ -4182,7 +4182,6 @@ QBT_CXX="$CXX"
# Define --wth-* and --enable-* arguments
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then :
enableval=$enable_debug;
@ -4745,7 +4744,9 @@ fi @@ -4745,7 +4744,9 @@ fi
case ${host_cpu} in #(
x86_64) :
libsubdirs="lib64 libx32 lib lib64" ;; #(
ppc64|s390x|sparc64|aarch64|ppc64le) :
mips*64*) :
libsubdirs="lib64 lib32 lib lib64" ;; #(
ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64) :
libsubdirs="lib64 lib lib64" ;; #(
*) :
libsubdirs="lib"
@ -5267,7 +5268,7 @@ fi @@ -5267,7 +5268,7 @@ fi
fi
if test "x$ax_lib" = "x"; then
as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
as_fn_error $? "Could not find a version of the Boost::System library!" "$LINENO" 5
fi
if test "x$link_system" = "xno"; then
as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5

5
m4/ax_boost_base.m4

@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 42
#serial 47
# example boost program (need to pass version)
m4_define([_AX_BOOST_BASE_PROGRAM],
@ -113,7 +113,8 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[ @@ -113,7 +113,8 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
dnl are found, e.g. when only header-only libraries are installed!
AS_CASE([${host_cpu}],
[x86_64],[libsubdirs="lib64 libx32 lib lib64"],
[ppc64|s390x|sparc64|aarch64|ppc64le],[libsubdirs="lib64 lib lib64"],
[mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
[ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64],[libsubdirs="lib64 lib lib64"],
[libsubdirs="lib"]
)

4
m4/ax_boost_system.m4

@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 19
#serial 20
AC_DEFUN([AX_BOOST_SYSTEM],
[
@ -108,7 +108,7 @@ AC_DEFUN([AX_BOOST_SYSTEM], @@ -108,7 +108,7 @@ AC_DEFUN([AX_BOOST_SYSTEM],
fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the library!)
AC_MSG_ERROR(Could not find a version of the Boost::System library!)
fi
if test "x$link_system" = "xno"; then
AC_MSG_ERROR(Could not link against $ax_lib !)

Loading…
Cancel
Save