X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=21a5818fb6658bc86bd9cec1c264e5845a9ad3d4;hp=eff93a0881a59be8bda98d9f18453a0347f4f8b3;hb=7203d5fb07be2d3ae006c2b65d0be1e6533e1273;hpb=4a5d42178cc0954efba8b24058da9c70cc77c35a

diff --git a/configure.in b/configure.in
index eff93a08..21a5818f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,17 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id$
-
 AC_PREREQ(2.61)
 AC_INIT
 AC_CONFIG_SRCDIR([src/tincd.c])
-AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
+AM_INIT_AUTOMAKE(tinc, 1.0.11)
 AC_CONFIG_HEADERS([config.h])
 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.
@@ -29,7 +24,7 @@ AC_PROG_RANLIB
 
 dnl Check and set OS
 
-#AC_CANONICAL_HOST
+AC_CANONICAL_HOST
 
 case $host_os in
   *linux*)
@@ -82,6 +77,11 @@ AC_ARG_ENABLE(tunemu,
   ]
 )
 
+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
@@ -143,7 +143,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"]
 )
 
@@ -161,14 +161,8 @@ AC_ARG_ENABLE(jumbograms,
   [ 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,
-  AS_HELP_STRING([--enable-tracing], [enable checkpoint tracing (debugging only)]),
-  [ AC_DEFINE(ENABLE_TRACING, 1, [Checkpoint tracing]) ]
-)
-
 AC_SUBST(INCLUDES)
 
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile lib/Makefile po/Makefile.in m4/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile lib/Makefile m4/Makefile])
 
 AC_OUTPUT