X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/23bbea75793621e6b21fbb13c00d8223113cf7b5..6adca914051e868931e44eed57e8e2d253f6f84e:/configure.ac

diff --git a/configure.ac b/configure.ac
index fbbb12e7..55678b31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,8 @@ AX_CFLAGS_WARN_ALL
 AM_PROG_LIBTOOL
 mdw_LIBTOOL_VERSION_INFO
 
+AM_PROG_AS
+
 AC_PROG_YACC
 
 AC_SUBST(AM_CFLAGS)
@@ -53,12 +55,13 @@ dnl Various standard types.
 AC_CHECK_TYPE([pid_t], [int])
 AC_TYPE_UID_T
 AC_CHECK_TYPE([ssize_t], [int])
+AC_CHECK_TYPE([socklen_t], [int])
 
 dnl The maths library.
-mdw_ORIG_LIBS=$LIBS
+mdw_ORIG_LIBS=$LIBS LIBS=
 AC_SEARCH_LIBS([log], [m])
 AC_SEARCH_LIBS([sqrt], [m])
-AC_SUBST([CATACOMB_LIBS], [$LIBS])
+AC_SUBST([MATHLIBS], [$LIBS])
 LIBS=$mdw_ORIG_LIBS
 
 dnl Find out whether very long integer types are available.
@@ -135,7 +138,7 @@ AC_CACHE_CHECK([whether the freewheel noise generator will work],
 [struct itimerval itv = { { 0, 0 }, { 0, 5000 } };
 jmp_buf j;
 setitimer(ITIMER_REAL, &itv, 0);
-sigsetjump(j, 1);],
+sigsetjmp(j, 1);],
 [catacomb_cv_freewheel=yes],
 [catacomb_cv_freewheel=no])])
 case $catacomb_cv_freewheel in