X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=configure.in;h=747d901c457c3113c08312c5bc2ebf11c2c4cf1b;hp=3970809c095fa623a25101e958bd0d67061779ab;hb=5d8fc5c038cb1e4a213e5d0283ebfc5c853ac04f;hpb=f74f5f43b01514e32f51e30015a8c7d5c7dd1521

diff --git a/configure.in b/configure.in
index 3970809..747d901 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 sinclude(ac_prog_cc_no_writeable_strings.m4)
 
-AC_INIT(secnet,0.1.16+,secnet@chiark.greenend.org.uk)
+AC_INIT(secnet,0.1.18+,secnet@chiark.greenend.org.uk)
 AC_CONFIG_SRCDIR(secnet.c)
 AC_CONFIG_HEADER(config.h)
 
@@ -11,6 +11,14 @@ AC_REVISION($Id: configure.in,v 1.4 2002/09/09 22:05:02 steve Exp $)
 
 AC_LANG_C
 
+# If fink is on the path then it is assumed we should use it.
+AC_PATH_PROG([FINK],[fink])
+if test "x$FINK" != x; then
+  finkdir=`echo $FINK|sed 's,/[[^/]]*/[[^/]]*$,,'`
+  CPPFLAGS="-I$finkdir/include ${CPPFLAGS}"
+  LDFLAGS="-L$finkdir/lib ${LDFLAGS}"
+fi
+
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -33,6 +41,16 @@ AC_CHECK_SIZEOF(unsigned short)
 AC_CHECK_SIZEOF(unsigned char)
 AC_PROG_CC_NO_WRITEABLE_STRINGS(WRITESTRINGS)
 
+AC_ARG_ENABLE(hacky-parallel,
+  [AS_HELP_STRING([--enable-hacky-parallel],
+                  [parallelise slow cryptography (default is no)])], [
+  case "$enableval" in
+  n|0|no) ;;
+  y|1|yes) CFLAGS="$CFLAGS -DHACKY_PARALLEL" ;;
+  *) ;;
+  esac
+])
+
 AC_DEFUN([REQUIRE_HEADER],[AC_CHECK_HEADER($1,,[AC_MSG_ERROR($1 not found)])])
 
 dnl the order in which libraries is checked is important
@@ -47,18 +65,11 @@ if test "$ac_cv_lib_fl_yywrap" != yes; then
   AC_MSG_ERROR([A compatible libfl is required])
 fi
 AC_CHECK_LIB(nsl,inet_ntoa)
-AC_CHECK_LIB(getopt,getopt_long)
-AC_CHECK_LIB(gnugetopt,getopt_long)
 AC_CHECK_LIB(socket,socket)
 AC_CHECK_LIB(resolv,inet_aton)
 AC_CHECK_LIB(adns,adns_init)
 REQUIRE_HEADER([adns.h])
 
-dnl check for getopt in standard library
-AC_REPLACE_FUNCS([snprintf])
-AC_CHECK_FUNC([getopt_long], [], [AC_LIBOBJ([getopt])
- AC_LIBOBJ([getopt1])])
-
 AC_OUTPUT(Makefile,echo timestamp >stamp-h)
 
 AH_TOP([
@@ -118,12 +129,6 @@ typedef unsigned char uint8_t;
 #endif
 #endif
 
-#ifndef HAVE_SNPRINTF
-#include <stdio.h>
-#include <stdarg.h>
-#include "snprintf.h"
-#endif
-
 #ifdef __GNUC__
 #define NORETURN(_x) void _x __attribute__ ((noreturn))
 #define FORMAT(_a,_b,_c) __attribute__ ((format (_a,_b,_c)))