X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/a094cab7007f2e759ef0854a7592d2b8fd3c6b2e..2685767a6125c1620719c7de6234aedf41857b7e:/configure.in

diff --git a/configure.in b/configure.in
index d2fdd02..c4ee560 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.5 1999/11/11 17:47:34 mdw Exp $
+dnl $Id: configure.in,v 1.23 2001/03/04 13:09:40 mdw Exp $
 dnl
 dnl Autoconfiguration for Catacomb
 dnl
@@ -29,8 +29,34 @@ dnl MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
-dnl Revision 1.5  1999/11/11 17:47:34  mdw
-dnl Updates for new configuration system, and `mptypes' generator.
+dnl Revision 1.23  2001/03/04 13:09:40  mdw
+dnl Mark dependency on mLib 2.0.0pre4 now.
+dnl
+dnl Revision 1.21  2000/10/08 12:01:28  mdw
+dnl Reinstate the `-pedantic' option.
+dnl
+dnl Revision 1.20  2000/08/15 21:45:25  mdw
+dnl New library configuration stuff from `common'.
+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
+dnl Revision 1.7  1999/11/13 01:55:48  mdw
+dnl Don't be pedantic, because using `long long' as a multiprecision type
+dnl gets complained about.
+dnl
+dnl Revision 1.6  1999/11/11 18:56:14  mdw
+dnl Use `libtool' to generate a shared library.
 dnl
 dnl Revision 1.5  1999/11/11 17:47:34  mdw
 dnl Updates for new configuration system, and `mptypes' generator.
@@ -42,9 +68,6 @@ dnl Revision 1.3  1999/10/24 10:20:36  mdw
 dnl Modify for standalone distribution.  The library's getting far too large
 dnl to be sensibly embedded in other programs.
 dnl
-dnl Revision 1.2  1999/10/23 12:56:25  mdw
-dnl Version number change.
-dnl
 dnl Revision 1.1  1999/09/03 08:41:11  mdw
 dnl Initial import.
 dnl
@@ -52,16 +75,14 @@ dnl
 dnl --- Boring boilerplate ---
 
 AC_INIT(blkc.h)
-AM_INIT_AUTOMAKE(catacomb, 1.0.0pre2)
+mdw_INIT_LIB(catacomb, Catacomb, 2.0.0pre8)
 AM_CONFIG_HEADER(config.h)
 
 dnl --- Make sure I can compile and build libraries ---
 
 AC_PROG_CC
+AM_PROG_LIBTOOL
 mdw_GCC_FLAGS
-AC_CHECK_PROG(AR, ar, ar)
-AC_PROG_RANLIB
-mdw_MLIB
 
 AC_PROG_YACC
 
@@ -78,14 +99,40 @@ 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)
+AC_CHECK_FUNCS(mlock)
+
 dnl --- Done ---
 
-AC_OUTPUT(Makefile catacomb-config)
+mdw_MLIB(2.0.0pre4)
+AC_OUTPUT(Makefile tests/Makefile catacomb-config:lib-config.in qcc,
+  chmod 755 qcc)
 
 dnl ----- That's all, folks -------------------------------------------------