X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.in;h=0561af8b8f7e9272ca4bf27e9fa20cd337c92a6f;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=f6a163b7fa88849255c12261bccc37796711c030;hpb=1b8f8918360b40a2749d40355266ed7dedbe41b5;p=meshlink

diff --git a/configure.in b/configure.in
index f6a163b7..0561af8b 100644
--- a/configure.in
+++ b/configure.in
@@ -2,9 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl $Id$
 
-AC_PREREQ(2.61)
+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,16 +13,12 @@ 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"
 
 dnl Checks for programs.
-AC_PROG_CC
+AC_PROG_CC_C99
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -75,6 +72,20 @@ case $host_os in
   ;;
 esac
 
+AC_ARG_ENABLE(tunemu,
+  AS_HELP_STRING([--enable-tunemu], [enable support for the tunemu driver]),
+  [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
+    tunemu=true
+  ]
+)
+
+AC_ARG_WITH(windows2000,
+  AS_HELP_STRING([--with-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
+  [AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])]
+)
+
+AM_CONDITIONAL(TUNEMU, test "$tunemu" = true)
+
 AC_CACHE_SAVE
 
 if test -d /sw/include ; then
@@ -94,7 +105,7 @@ dnl We do this in multiple stages, because unlike Linux all the other operating
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h sys/uio.h sys/wait.h netdb.h arpa/inet.h])
-AC_CHECK_HEADERS([net/if.h net/if_types.h linux/if_tun.h net/if_tun.h net/if_tap.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h],
+AC_CHECK_HEADERS([net/if.h net/if_types.h linux/if_tun.h net/if_tun.h net/if_tap.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h time.h],
   [], [], [#include "have.h"]
 )
 AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
@@ -122,7 +133,7 @@ dnl Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog writev],
+AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system time unsetenv vsyslog writev],
   [], [], [#include "have.h"]
 )
 AC_FUNC_MALLOC
@@ -137,7 +148,7 @@ AC_CHECK_FUNC(gethostbyname, [], [
   AC_CHECK_LIB(nsl, gethostbyname)
 ])
 
-AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo inet_aton],
+AC_CHECK_DECLS([freeaddrinfo, gai_strerror, getaddrinfo, getnameinfo],
   [], [], [#include "have.h"]
 )
 
@@ -147,16 +158,15 @@ 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/cipher.c gcrypt/cipher.h gcrypt/crypto.c gcrypt/crypto.h gcrypt/digest.c gcrypt/digest.h gcrypt/rsa.c gcrypt/rsa.h gcrypt/rsagen.c gcrypt/rsagen.h src/
 else
-    	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/
+	tinc_OPENSSL
+    	ln -sf openssl/cipher.c openssl/cipher.h openssl/crypto.c openssl/crypto.h openssl/digest.c openssl/digest.h openssl/rsa.c openssl/rsa.h openssl/rsagen.c openssl/rsagen.h src/
 fi