X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/db2623e14b46d8297d11326cc2f178a45140ed48..f41f820e4b3e230d9314cc4323abf59babdd4e67:/configure.in

diff --git a/configure.in b/configure.in
index 8e7ead1..f77e6ec 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.10 1999/12/22 16:03:31 mdw Exp $
+dnl $Id: configure.in,v 1.17 2000/07/03 18:14:53 mdw Exp $
 dnl
 dnl Autoconfiguration for Catacomb
 dnl
@@ -29,6 +29,19 @@ dnl MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.17  2000/07/03 18:14:53  mdw
+dnl Version bump.
+dnl
+dnl Revision 1.13  2000/06/17 13:51:03  mdw
+dnl Whoops.  Too eager with the mLib version.
+dnl
+dnl Revision 1.12  2000/06/17 12:57:47  mdw
+dnl New free counter noise generator, for use if /dev/random is
+dnl unavailable.
+dnl
+dnl Revision 1.11  2000/06/17 10:51:23  mdw
+dnl Version number changes.  Find maths library for Maurer's test.
+dnl
 dnl Revision 1.10  1999/12/22 16:03:31  mdw
 dnl New mLib version.  Find socket functions for pixie.
 dnl
@@ -59,7 +72,7 @@ dnl
 dnl --- Boring boilerplate ---
 
 AC_INIT(blkc.h)
-AM_INIT_AUTOMAKE(catacomb, 1.0.0)
+AM_INIT_AUTOMAKE(catacomb, 2.0.0pre5)
 AM_CONFIG_HEADER(config.h)
 
 dnl --- Make sure I can compile and build libraries ---
@@ -67,7 +80,6 @@ dnl --- Make sure I can compile and build libraries ---
 AC_PROG_CC
 AM_PROG_LIBTOOL
 mdw_GCC_FLAGS(-Wall)
-mdw_MLIB(1.6.2)
 
 AC_PROG_YACC
 
@@ -84,12 +96,31 @@ AC_TYPE_UID_T
 AC_CHECK_TYPE(time_t, long)
 mdw_TYPE_SSIZE_T
 
-dnl --- Can I call `initgroups'? ---
-dnl
-dnl This is used in noise-gathering.
+dnl --- The maths library, for Maurer's test ---
+
+mdw_CHECK_MANYLIBS(log, m,,, [#include <math.h>], [2])
+mdw_CHECK_MANYLIBS(sqrt, m,,, [#include <math.h>], [2])
+
+dnl --- Functions used for noise-gathering ---
 
 AC_CHECK_FUNCS(setgroups)
 
+AC_CACHE_CHECK([whether the freewheel noise generator will work],
+[catacomb_cv_freewheel],
+[AC_TRY_LINK([
+#include <setjmp.h>
+#include <sys/time.h>
+],
+[struct itimerval itv = { { 0, 0 }, { 0, 5000 } };
+jmp_buf j;
+setitimer(ITIMER_REAL, &itv, 0);
+sigsetjmp(j, 1);],
+[catacomb_cv_freewheel=yes],
+[catacomb_cv_freewheel=no])])
+if test "$catacomb_cv_freewheel" = "yes"; then
+  AC_DEFINE([USE_FREEWHEEL])
+fi
+
 dnl --- Support for the passphrase pixie ---
 
 mdw_CHECK_MANYLIBS(socket, socket)
@@ -97,6 +128,7 @@ AC_CHECK_FUNCS(mlock)
 
 dnl --- Done ---
 
-AC_OUTPUT(Makefile catacomb-config)
+mdw_MLIB(2.0.0pre1)
+AC_OUTPUT(Makefile tests/Makefile catacomb-config qcc, chmod 755 qcc)
 
 dnl ----- That's all, folks -------------------------------------------------