From d0e084ce1dca1a0d928527f1eeba288e6d1fc72c Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sun, 20 Oct 2019 01:16:42 +0800
Subject: [PATCH] Update m4 scripts

---
 configure             | 7 ++++---
 m4/ax_boost_base.m4   | 5 +++--
 m4/ax_boost_system.m4 | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index e74f24ad6..3f4b8adc0 100755
--- a/configure
+++ b/configure
@@ -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
                         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
 
             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
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
index d1a65b9f6..16fa69b41 100644
--- a/m4/ax_boost_base.m4
+++ b/m4/ax_boost_base.m4
@@ -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],[
     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"]
     )
 
diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
index 207d7be8d..323e2a676 100644
--- a/m4/ax_boost_system.m4
+++ b/m4/ax_boost_system.m4
@@ -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],
 
             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 !)