X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/c08b284af348819a5fb653c80edf2a48eba62545..578a86d91941a0f722b87973d88e84ec2cf9a608:/configure.in

diff --git a/configure.in b/configure.in
index d000631..f7761b7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-dnl -*-fundamental-*-
+dnl -*-m4-*-
 dnl
-dnl $Id: configure.in,v 1.9 1999/12/13 15:42:50 mdw Exp $
+dnl $Id: configure.in,v 1.28 2004/04/08 01:36:15 mdw Exp $
 dnl
 dnl Autoconfiguration for Catacomb
 dnl
@@ -26,48 +26,17 @@ dnl License along with Catacomb; if not, write to the Free
 dnl Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 dnl MA 02111-1307, USA.
 
-dnl ----- Revision history --------------------------------------------------
-dnl
-dnl $Log: configure.in,v $
-dnl Revision 1.9  1999/12/13 15:42:50  mdw
-dnl Version bump.
-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.
-dnl
-dnl Revision 1.4  1999/11/11 00:58:19  mdw
-dnl Use canned check for `ssize_t'.
-dnl
-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
-
 dnl --- Boring boilerplate ---
 
 AC_INIT(blkc.h)
-AM_INIT_AUTOMAKE(catacomb, 1.0.0)
+mdw_INIT_LIB(catacomb, Catacomb, 2.1.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl --- Make sure I can compile and build libraries ---
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
-mdw_GCC_FLAGS(-Wall)
-mdw_MLIB(1.6.1)
+mdw_GCC_FLAGS
 
 AC_PROG_YACC
 
@@ -84,14 +53,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.0)
+AC_OUTPUT(Makefile tests/Makefile catacomb-config:lib-config.in qcc,
+  chmod 755 qcc)
 
 dnl ----- That's all, folks -------------------------------------------------