Use the crypto wrappers again instead of calling OpenSSL directly.

[tinc] / configure.in

diff --git a/configure.in b/configure.in
index 2eed95b..eb0040b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,6 +5,7 @@ dnl $Id$
 AC_PREREQ(2.59)
 AC_INIT
 AC_CONFIG_SRCDIR([src/tincd.c])
+AC_GNU_SOURCE
 AM_INIT_AUTOMAKE(tinc, 1.1-cvs)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
@@ -12,10 +13,6 @@ AM_MAINTAINER_MODE
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.14.1)
 
-# Enable GNU extensions.
-# Define this here, not in acconfig's @TOP@ section, since definitions
-# in the latter don't make it into the configure-time tests.
-AC_GNU_SOURCE
 AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
 
 ALL_LINGUAS="nl"
@@ -147,15 +144,14 @@ dnl These are defined in files in m4/
 
 AC_ARG_WITH(libgcrypt, AC_HELP_STRING([--with-libgcrypt], [enable use of libgcrypt instead of OpenSSL])], [])
 
-AM_PATH_LIBGCRYPT([], [], [])
-tinc_OPENSSL
 tinc_ZLIB
 tinc_LZO
 
 if test "$with_libgcrypt" = yes; then
-       AC_MSG_ERROR([Libgcrypt support not fully implemented yet.]);
-       break;
+       AM_PATH_LIBGCRYPT([1.4.0], [], [])
+       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