symm/salsa20-arm-neon.S: Remove extra copy of the state-layout diagram.

[catacomb] / configure.ac

diff --git a/configure.ac b/configure.ac
index b41687a..af08371 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,8 @@ AC_DEFUN([catacomb_CPU_FAMILIES],
    $1([x86_64,cygwin], [amd64], [win])
    $1([x86_64,*], [amd64], [sysv])
    $1([arm,*-gnueabi | arm,*-gnueabihf | dnl
-       armv*,*-gnueabi | armv*,*-gnueabihf], [armel], [gnueabi])])
+       armv*,*-gnueabi | armv*,*-gnueabihf | dnl
+       arm,*-androideabi], [armel], [gnueabi])])
 
 dnl A utility to clear the `seen' flags, used so as to process each CPU or
 dnl ABI once.
@@ -239,11 +240,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.