Reload configuration through control socket

[tinc] / configure.in

diff --git a/configure.in b/configure.in
index 3cb6a4d..670e855 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl $Id$
 
 
 dnl $Id$
 

-AC_PREREQ(2.61)
+AC_PREREQ(2.59)

 AC_INIT
 AC_CONFIG_SRCDIR([src/tincd.c])
 AC_INIT
 AC_CONFIG_SRCDIR([src/tincd.c])

-AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
+AM_INIT_AUTOMAKE(tinc, 1.1-cvs)

 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 


@@ -86,6 +86,9 @@ fi
 
 dnl Checks for libraries.
 
 
 dnl Checks for libraries.
 

+AC_CHECK_LIB(event, event_init,
+  [], [AC_MSG_ERROR(libevent is required)])
+

 dnl Checks for header files.
 dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies.
 
 dnl Checks for header files.
 dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies.
 


@@ -142,10 +145,20 @@ AC_CACHE_SAVE
 
 dnl These are defined in files in m4/
 
 
 dnl These are defined in files in m4/
 

-tinc_OPENSSL
+AC_ARG_WITH(libgcrypt, AC_HELP_STRING([--with-libgcrypt], [enable use of libgcrypt instead of OpenSSL])], [])
+

 tinc_ZLIB
 tinc_LZO
 
 tinc_ZLIB
 tinc_LZO
 

+if test "$with_libgcrypt" = yes; then
+       AM_PATH_LIBGCRYPT([], [], [])
+       ln -sf gcrypt/crypto.c gcrypt/crypto.h gcrypt/cipher.c gcrypt/cipher.h gcrypt/digest.c gcrypt/digest.h gcrypt/rsa.c gcrypt/rsa.h src/
+else
+       tinc_OPENSSL
+       ln -sf openssl/crypto.c openssl/crypto.h openssl/cipher.c openssl/cipher.h openssl/digest.c openssl/digest.h openssl/rsa.c openssl/rsa.h src/
+fi
+       
+

 dnl Check if support for jumbograms is requested 
 AC_ARG_ENABLE(jumbograms,
   AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
 dnl Check if support for jumbograms is requested 
 AC_ARG_ENABLE(jumbograms,
   AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),