diff --git a/dist-build/Makefile.am b/dist-build/Makefile.am
index 52c67545..db5b83a9 100644
--- a/dist-build/Makefile.am
+++ b/dist-build/Makefile.am
@@ -3,8 +3,11 @@ EXTRA_DIST = \
 	android-build.sh \
 	android-arm.sh \
 	android-armv7-a.sh \
-	android-x86.sh \
+	android-armv8-a.sh \
 	android-mips32.sh \
+	android-mips64.sh \
+	android-x86.sh \
+	android-x86-64.sh \
 	emscripten.sh \
 	ios.sh \
 	msys2-win32.sh \
diff --git a/dist-build/android-mips64.sh b/dist-build/android-mips64.sh
new file mode 100755
index 00000000..579969d3
--- /dev/null
+++ b/dist-build/android-mips64.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+export TARGET_ARCH=mips64r6
+export CFLAGS="-Os -march=${TARGET_ARCH}"
+ARCH=mips64 HOST_COMPILER=mips64el-linux-android "$(dirname "$0")/android-build.sh"
diff --git a/dist-build/android-x86-64.sh b/dist-build/android-x86-64.sh
new file mode 100755
index 00000000..78fdb49b
--- /dev/null
+++ b/dist-build/android-x86-64.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+export TARGET_ARCH=x86-64
+export CFLAGS="-Os -march=${TARGET_ARCH}"
+ARCH=x86_64 HOST_COMPILER=x86_64-linux-android "$(dirname "$0")/android-build.sh"
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
index af1b556b..5ae5d868 100644
--- a/m4/ax_check_compile_flag.m4
+++ b/m4/ax_check_compile_flag.m4
@@ -56,7 +56,7 @@
 #serial 2
 
 AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
 AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
 AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
   ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
@@ -66,7 +66,7 @@ AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
     [AS_VAR_SET(CACHEVAR,[yes])],
     [AS_VAR_SET(CACHEVAR,[no])])
   _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+AS_VAR_IF(CACHEVAR,yes,
   [m4_default([$2], :)],
   [m4_default([$3], :)])
 AS_VAR_POPDEF([CACHEVAR])dnl
diff --git a/m4/ax_check_link_flag.m4 b/m4/ax_check_link_flag.m4
index 5895fa3d..950279f3 100644
--- a/m4/ax_check_link_flag.m4
+++ b/m4/ax_check_link_flag.m4
@@ -56,7 +56,8 @@
 #serial 2
 
 AC_DEFUN([AX_CHECK_LINK_FLAG],
-[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
 AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
   ax_check_save_flags=$LDFLAGS
   LDFLAGS="$LDFLAGS $4 $1"
@@ -65,7 +66,7 @@ AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
     [AS_VAR_SET(CACHEVAR,[yes])],
     [AS_VAR_SET(CACHEVAR,[no])])
   LDFLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+AS_VAR_IF(CACHEVAR,yes,
   [m4_default([$2], :)],
   [m4_default([$3], :)])
 AS_VAR_POPDEF([CACHEVAR])dnl