Merge branch 'master' into 1.1

[tinc] / configure.in

diff --git a/configure.in b/configure.in
index 456b9b2..1db53d1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Process this file with autoconf to produce a configure script.
 

-dnl $Id$
-
-AC_PREREQ(2.59)
+AC_PREREQ(2.61)

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


@@ -10,15 +8,16 @@ AM_INIT_AUTOMAKE(tinc, 1.1-cvs)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 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.
+AC_GNU_SOURCE

 AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
 
 ALL_LINGUAS="nl"
 
 dnl Checks for programs.
 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_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S


@@ -26,7 +25,7 @@ AC_PROG_RANLIB
 
 dnl Check and set OS
 
 
 dnl Check and set OS
 

-#AC_CANONICAL_HOST
+AC_CANONICAL_HOST

 
 case $host_os in
   *linux*)
 
 case $host_os in
   *linux*)


@@ -72,6 +71,20 @@ case $host_os in
   ;;
 esac
 
   ;;
 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
 AC_CACHE_SAVE
 
 if test -d /sw/include ; then


@@ -81,11 +94,6 @@ if test -d /sw/lib ; then
   LIBS="$LIBS -L/sw/lib"
 fi
 
   LIBS="$LIBS -L/sw/lib"
 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.
 
 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.
 


@@ -134,7 +142,7 @@ AC_CHECK_FUNC(gethostbyname, [], [
   AC_CHECK_LIB(nsl, 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"]
 )
 
   [], [], [#include "have.h"]
 )
 


@@ -144,6 +152,7 @@ dnl These are defined in files in m4/
 
 AC_ARG_WITH(libgcrypt, AC_HELP_STRING([--with-libgcrypt], [enable use of libgcrypt instead of OpenSSL])], [])
 
 
 AC_ARG_WITH(libgcrypt, AC_HELP_STRING([--with-libgcrypt], [enable use of libgcrypt instead of OpenSSL])], [])
 

+tinc_LIBEVENT

 tinc_ZLIB
 tinc_LZO
 
 tinc_ZLIB
 tinc_LZO
 


@@ -162,14 +171,8 @@ AC_ARG_ENABLE(jumbograms,
   [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ]
 )
 
   [ 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_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
 
 AC_OUTPUT