--- gvpe/configure.ac	2003/10/14 03:22:09	1.8
+++ gvpe/configure.ac	2003/10/15 06:06:41	1.16
@@ -3,7 +3,7 @@
 AC_PREREQ(2.57)
 AC_INIT(src/vped.C)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(vpe, 1.0)
+AM_INIT_AUTOMAKE(vpe, 1.2)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -67,13 +67,18 @@
   [AC_HELP_STRING(--enable-iftype[=TYPE/SUBTYPE], [
      Use kernel/net device interface TYPE/SUBTYPE.
      Working combinations are:
-        "native/linux" "tincd/linux";
+        "native/linux"
+        "tincd/linux"
+        "tincd/freebsd"
+        "native/cygwin";
      Untested combinations are:
-        "tincd/freebsd" "tincd/netbsd" "tincd/darwin" "tincd/solaris"
-        "tincd/openbsd" "tincd/netbsd" "tincd/cygwin";
+        "tincd/netbsd"
+        "tincd/darwin"
+        "tincd/solaris"
+        "tincd/openbsd";
      Broken combinations are:
-        "native/cygwin";
-     The default is autodetected.
+        "tincd/cygwin";
+     The default is to autodetect.
   ])],
   [
     IFTYPE=`echo $enableval | sed s%/.*%%`
@@ -117,7 +122,7 @@
        AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
      ;;
      *cygwin*)
-       IFTYPE=tincd
+       IFTYPE=native
        IFSUBTYPE=cygwin
        AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
      ;;
@@ -139,7 +144,8 @@
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
-	sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h cygwin.h arpa/inet.h netinet/in.h])
+	sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h sys/cygwin.h arpa/inet.h \
+        sys/poll.h sys/mman.h netinet/in.h])
 AC_CHECK_HEADERS([net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h netinet/in_systm.h], [], [],
 [
 #include <sys/types.h>
@@ -196,7 +202,8 @@
 
 AC_HEADER_STDC
 
-AC_CHECK_FUNCS(asprintf daemon get_current_dir_name putenv select strerror strsignal strtol unsetenv mlockall)
+dnl argl, could somebody catapult darwin into the 21st century???
+AC_CHECK_FUNCS(asprintf daemon get_current_dir_name putenv select strerror strsignal strtol unsetenv mlockall poll)
 
 AC_FUNC_ALLOCA
 
@@ -217,7 +224,11 @@
 
 dnl These are defined in files in m4/
 tinc_TUNTAP
+
 tinc_OPENSSL
+if test "x$openssl_include" != x; then
+   CXXFLAGS="$CXXFLAGS -I$openssl_include"
+fi
 dnl tinc_ZLIB
 
 AC_ARG_ENABLE(rohc,
@@ -241,23 +252,23 @@
 )
 
 AC_ARG_ENABLE(icmp,
-  [AC_HELP_STRING(--enable-icmp, [enable icmp protocol support.])],
+  [AC_HELP_STRING(--enable-icmp, [enable icmp protocol support (default disabled).])],
   AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])
 )
 
 AC_ARG_ENABLE(tcp,
-  [AC_HELP_STRING(--enable-tcp, [enable tcp protocol support.])],
+  [AC_HELP_STRING(--enable-tcp, [enable tcp protocol support (default disabled).])],
   AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.])
 )
 
 AC_ARG_ENABLE(http-proxy,
-  [AC_HELP_STRING(--enable-http-proxy, [enable http proxy connect support.])],
+  [AC_HELP_STRING(--enable-http-proxy, [enable http proxy connect support (default disabled).])],
   AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
 )
 
-HMAC=16    dnl see also the AC_HELP_STRING
+HMAC=12    dnl see also the AC_HELP_STRING
 AC_ARG_ENABLE(hmac-length,
-  [AC_HELP_STRING(--enable-hmac-length=BYTES, [use a hmac of length BYTES bytes (default 16). Allowed values are 4, 8, 12, 16.])],
+  [AC_HELP_STRING(--enable-hmac-length=BYTES, [use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.])],
   HMAC=$enableval
 )
 AC_DEFINE_UNQUOTED(HMACLENGTH, $HMAC, [Size of HMAC in each packet in bytes.])
@@ -289,7 +300,7 @@
 AC_ARG_ENABLE(cipher,
   [AC_HELP_STRING(--enable-cipher, [
      Select the symmetric cipher (default "bf"). Must be one of
-     "bf" (blowfish), "aes-128", "aes-192" or "aes-256".])],
+     "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])],
   if test "x$enableval" = xbf     ; then CIPHER=bf_cbc     ; fi
   if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi
   if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi
@@ -301,11 +312,11 @@
 AC_ARG_ENABLE(digest,
   [AC_HELP_STRING(--enable-digest, [
      Select the digets algorithm to use (default "sha1"). Must be one of
-     "sha1", "ripemd160", "md4" or "md5".])],
+     "sha1", "ripemd160", "md5" or "md4" (insecure).])],
   if test "x$enableval" = xsha1     ; then DIGEST=sha1     ; fi
   if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi
-  if test "x$enableval" = xmd4      ; then DIGEST=md4      ; fi
   if test "x$enableval" = xmd5      ; then DIGEST=md5      ; fi
+  if test "x$enableval" = xmd4      ; then DIGEST=md4      ; fi
 )
 AC_DEFINE_UNQUOTED(ENABLE_DIGEST, EVP_${DIGEST}, [Select the digest algorithm to use.])