X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/be12dd9fffe97a3c5336f77110292e4714bffbbb..6a024d24d97cb5d42c0091571735475b849f59f4:/configure.ac

diff --git a/configure.ac b/configure.ac
index b41687a5..8ebda7ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,13 @@ AC_PROG_CC
 AX_CFLAGS_WARN_ALL
 AM_PROG_LIBTOOL
 mdw_LIBTOOL_VERSION_INFO
+case $host_os in
+  cygwin* | mingw* | pw32* | os2* | darwin* | cegcc*)
+    TEST_LDFLAGS=-no-fast-install ;;
+  *)
+    TEST_LDFLAGS=-no-install ;;
+esac
+AC_SUBST([TEST_LDFLAGS])
 
 AM_PROG_AS
 
@@ -78,8 +85,8 @@ AC_DEFUN([catacomb_CPU_FAMILIES],
    $1([i[[3-6]]86,*], [x86], [sysv])
    $1([x86_64,cygwin], [amd64], [win])
    $1([x86_64,*], [amd64], [sysv])
-   $1([arm,*-gnueabi | arm,*-gnueabihf | dnl
-	armv*,*-gnueabi | armv*,*-gnueabihf], [armel], [gnueabi])])
+   $1([arm,* | armv*,*], [armel], [std])
+   $1([aarch64,*], [arm64], [std])])
 
 dnl A utility to clear the `seen' flags, used so as to process each CPU or
 dnl ABI once.
@@ -239,11 +246,10 @@ AC_CHECK_TYPE([socklen_t], [],
 ])
 
 dnl The maths library.
-mdw_ORIG_LIBS=$LIBS LIBS=
+mdw_ORIG_LIBS=$LIBS LIBS=$CATACOMB_LIBS
 AC_SEARCH_LIBS([log], [m])
 AC_SEARCH_LIBS([sqrt], [m])
-AC_SUBST([MATHLIBS], [$LIBS])
-LIBS=$mdw_ORIG_LIBS
+CATACOMB_LIBS=$LIBS LIBS=$mdw_ORIG_LIBS
 
 dnl Logging is weird under Termux.  Unfortunately, it involves macros, so we
 dnl have to do this the hard way.