--- gvpe/configure.ac	2007/03/29 17:35:20	1.45
+++ gvpe/configure.ac	2013/07/10 01:51:40	1.60
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.59)
+AC_PREREQ(2.69)
 AC_INIT
 AC_CONFIG_SRCDIR([src/gvpe.C])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gvpe, 2.01)
+AM_INIT_AUTOMAKE(gvpe, 2.24)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
@@ -48,9 +48,6 @@
 #endif
 ])
 
-dnl Include the macros from the m4/ directory
-AM_ACLOCAL_INCLUDE(m4)
-
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.11.5)
 
@@ -66,7 +63,6 @@
 ALL_LINGUAS=""
 
 dnl Checks for programs.
-AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_GCC_TRADITIONAL
@@ -160,7 +156,7 @@
 dnl Checks for libraries.
 
 AC_LANG(C++)
-AC_CHECK_HEADERS(ext/hash_map clocale)
+AC_CHECK_HEADERS(tr1/unordered_map ext/hash_map clocale)
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
@@ -228,6 +224,9 @@
   AC_CHECK_LIB(nsl, gethostbyname)
 ])
 
+dnl libev support
+m4_include([libev/libev.m4])
+
 AC_LANG_POP
 
 dnl AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo])
@@ -243,26 +242,42 @@
 fi
 dnl tinc_ZLIB
 
+AC_ARG_ENABLE(threads,
+  [AS_HELP_STRING(--enable-threads,try to use threads for long-running asynchronous operations (default enabled).)],
+  [try_threads=$enableval],
+  [try_threads=yes]
+)
+
+if test "x$try_threads" = xyes; then
+   AC_CHECK_HEADER(pthread.h,[
+      LIBS="$LIBS -lpthread"
+      AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([#include <pthread.h>], [pthread_t id; pthread_create (&id, 0, 0, 0);])],
+         [AC_DEFINE_UNQUOTED(ENABLE_PTHREADS, 1, [POSIX thread support.])]
+      )
+   ])
+fi
+
 AC_ARG_ENABLE(static-daemon,
   [AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)],
   [LDFLAGS_DAEMON=-static]
 )
 AC_SUBST(LDFLAGS_DAEMON)
 
-AC_ARG_ENABLE(rohc,
-  [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],
-  [
-  echo
-  echo "**********************************************************************"
-  echo "**********************************************************************"
-  echo "**** --enable-rohc is highly experimental, do not use ****************"
-  echo "**********************************************************************"
-  echo "**********************************************************************"
-  echo
-  rohc=true
-  AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])
-  ]
-)
+dnl AC_ARG_ENABLE(rohc,
+dnl   [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],
+dnl   [
+dnl   echo
+dnl   echo "**********************************************************************"
+dnl   echo "**********************************************************************"
+dnl   echo "**** --enable-rohc is highly experimental, do not use ****************"
+dnl   echo "**********************************************************************"
+dnl   echo "**********************************************************************"
+dnl   echo
+dnl   rohc=true
+dnl   AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])
+dnl   ]
+dnl )
 
 AM_CONDITIONAL(ROHC, test x$rohc = xtrue)
 
@@ -271,18 +286,41 @@
 dnl   AC_DEFINE_UNQUOTED(ENABLE_BRIDGING, 1, [bridging support.])
 dnl )
 
+ICMP=1
 AC_ARG_ENABLE(icmp,
-  [AS_HELP_STRING(--enable-icmp,enable icmp protocol support (default disabled).)],
-  AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])
+  [AS_HELP_STRING(--disable-icmp,enable icmp protocol support (default enabled).)],
+  if test "x$enableval" = xno; then
+     ICMP=0
+  fi
 )
+if test "x$ICMP" = x1; then
+  AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])
+fi
 
+TCP=1
 AC_ARG_ENABLE(tcp,
-  [AS_HELP_STRING(--enable-tcp,enable tcp protocol support (default disabled).)],
+  [AS_HELP_STRING(--disable-tcp,enable tcp protocol support (default enabled).)],
+  if test "x$enableval" = xno; then
+     TCP=0
+  fi
+)
+if test "x$TCP" = x1; then
   AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.])
+fi
+
+HTTP=1
+AC_ARG_ENABLE(http-proxy,
+  [AS_HELP_STRING(--disable-http-proxy,enable http proxy connect support (default enabled).)],
+  if test "x$enableval" = xno; then
+     HTTP=0
+  fi
 )
+if test "x$HTTP" = x1; then
+  AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
+fi
 
 AC_ARG_ENABLE(dns,
-  [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (DOES NOT WORK).)],
+  [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (default disabled).)],
   [
     AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])])
     AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])])
@@ -291,11 +329,6 @@
   ]
 )
 
-AC_ARG_ENABLE(http-proxy,
-  [AS_HELP_STRING(--enable-http-proxy,enable http proxy connect support (default disabled).)],
-  AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
-)
-
 HMAC=12
 AC_ARG_ENABLE(hmac-length,
   [AS_HELP_STRING(--enable-hmac-length=BYTES,[
@@ -313,11 +346,11 @@
 AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.])
 
 MTU=1500
-AC_ARG_ENABLE(mtu,
+AC_ARG_ENABLE(max-mtu,
   [AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)],
   MTU=$enableval
 )
-AC_DEFINE_UNQUOTED(MAX_MTU, $MTU + 14, [Maximum MTU supported.])
+AC_DEFINE_UNQUOTED(MAX_MTU, ($MTU + 14), [Maximum MTU supported.])
 
 COMPRESS=1
 AC_ARG_ENABLE(compression,
@@ -330,7 +363,7 @@
 
 CIPHER=aes_128_cbc
 AC_ARG_ENABLE(cipher,
-  [AS_HELP_STRING(--enable-cipher,[
+  [AS_HELP_STRING(--enable-cipher=CIPHER,[
       Select the symmetric cipher (default "aes-128").
       Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])],
   if test "x$enableval" = xbf     ; then CIPHER=bf_cbc     ; fi
@@ -342,9 +375,9 @@
 
 DIGEST=ripemd160
 AC_ARG_ENABLE(digest,
-  [AS_HELP_STRING(--enable-digest,[
+  [AS_HELP_STRING(--enable-digest=CIPHER,[
       Select the digest algorithm to use (default "ripemd160"). Must be one of
-      "sha512", "sha256", "sha1", "ripemd160", "md5" or "md4" (insecure).])],
+      "sha512", "sha256", "sha1" (somewhat insecure), "ripemd160", "md5" (insecure) or "md4" (insecure).])],
   if test "x$enableval" = xsha512   ; then DIGEST=sha512   ; fi
   if test "x$enableval" = xsha256   ; then DIGEST=sha256   ; fi
   if test "x$enableval" = xsha1     ; then DIGEST=sha1     ; fi
@@ -358,9 +391,11 @@
    CXXFLAGS="$CXXFLAGS -fno-rtti"
 fi
 
-if $CXX -v --help 2>&1 | grep -q fexceptions; then
-   CXXFLAGS="$CXXFLAGS -fno-exceptions"
-fi
+#if $CXX -v --help 2>&1 | grep -q fexceptions; then
+#   CXXFLAGS="$CXXFLAGS -fno-exceptions"
+#fi
+
+LIBS="$EXTRA_LIBS $LIBS"
 
 dnl if $CXX -v --help 2>&1 | grep -q ffunction-sections; then
 dnl    CXXFLAGS="$CXXFLAGS -ffunction-sections"
@@ -400,6 +435,11 @@
 echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure"
 fi
 
+if test "x$DIGEST" = xmd5; then
+echo "***"
+echo "*** WARNING: The digest you have chosen ($DIGEST) is probably insecure"
+fi
+
 if test "$HMAC" -lt 12; then
 echo "***"
 echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure"