Add a better autoconf check for libevent.

[tinc] / configure.in

diff --git a/configure.in b/configure.in
index 456b9b2..2dba9be 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
 ALL_LINGUAS="nl"
 
 dnl Checks for programs.
 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


@@ -72,6 +72,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 +95,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 +143,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 +153,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