Merge branch 'master' into 1.1

[meshlink] / configure.in

diff --git a/configure.in b/configure.in
index c9516371cc33c2d30873fa097d1f912a811444c7..0561af8b8f7e9272ca4bf27e9fa20cd337c92a6f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,30 +5,25 @@ dnl $Id$
 AC_PREREQ(2.59)
 AC_INIT
 AC_CONFIG_SRCDIR([src/tincd.c])
-AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
+AC_GNU_SOURCE
+AM_INIT_AUTOMAKE(tinc, 1.1-cvs)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.12.1)
+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_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions])
 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
 AC_PROG_RANLIB
 
-AC_ISC_POSIX
-
 dnl Check and set OS
 
 #AC_CANONICAL_HOST
@@ -77,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
@@ -88,12 +97,15 @@ fi
 
 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.
 
 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 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],
@@ -121,11 +133,11 @@ 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"]
 )
-jm_FUNC_MALLOC
-jm_FUNC_REALLOC
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
 
 dnl Support for SunOS
 
@@ -136,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"]
 )
 
@@ -144,16 +156,20 @@ AC_CACHE_SAVE
 
 dnl These are defined in files in m4/
 
-case $host_os in
-  *linux*)
-    tinc_TUNTAP
-  ;;
-esac
+AC_ARG_WITH(libgcrypt, AC_HELP_STRING([--with-libgcrypt], [enable use of libgcrypt instead of OpenSSL])], [])
 
-tinc_OPENSSL
 tinc_ZLIB
 tinc_LZO
 
+if test "$with_libgcrypt" = yes; then
+       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
+       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
+       
+
 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)]),