Imported gnutls based branch.

[tinc] / configure.in

diff --git a/configure.in b/configure.in
index f72229c..be60b04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.85 2003/10/08 11:34:55 guus Exp $
+dnl $Id: configure.in,v 1.13.2.86 2004/01/10 23:21:36 guus Exp $
 
-AC_PREREQ(2.57)
-AC_INIT(src/tincd.c)
-AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
-AM_CONFIG_HEADER(config.h)
+AC_PREREQ(2.59)
+AC_INIT
+AC_CONFIG_SRCDIR([src/tincd.c])
+AM_INIT_AUTOMAKE(tinc, 1.0-gnutls)
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 dnl Include the macros from the m4/ directory
@@ -278,19 +279,20 @@ case $host_os in
   ;;
 esac
 
-tinc_OPENSSL
+dnl tinc_OPENSSL
+AM_PATH_LIBGNUTLS([1.0.4], [], [AC_MSG_ERROR([GNUTLS library not found.]); break;])
 tinc_ZLIB
 tinc_LZO
 
 dnl Check if support for jumbograms is requested 
 AC_ARG_ENABLE(jumbograms,
-  AC_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
+  AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
   [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ]
 )
 
 dnl Check if checkpoint tracing has to be enabled
 AC_ARG_ENABLE(tracing,
-  AC_HELP_STRING([--enable-tracing], [enable checkpoint tracing (debugging only)]),
+  AS_HELP_STRING([--enable-tracing], [enable checkpoint tracing (debugging only)]),
   [ AC_DEFINE(ENABLE_TRACING, 1, [Checkpoint tracing]) ]
 )