--- gvpe/configure.ac	2003/10/15 01:35:45	1.14
+++ gvpe/configure.ac	2003/10/16 20:35:14	1.18
@@ -69,12 +69,14 @@
      Working combinations are:
         "native/linux"
         "tincd/linux"
-        "tincd/freebsd";
+        "tincd/freebsd"
+        "tincd/openbsd"
+        "tincd/darwin"
+        "native/cygwin";
      Untested combinations are:
         "tincd/netbsd"
-        "tincd/darwin"
         "tincd/solaris"
-        "tincd/openbsd";
+        "tincd/mingw";
      Broken combinations are:
         "tincd/cygwin";
      The default is to autodetect.
@@ -121,7 +123,7 @@
        AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
      ;;
      *cygwin*)
-       IFTYPE=tincd
+       IFTYPE=native
        IFSUBTYPE=cygwin
        AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
      ;;
@@ -223,8 +225,11 @@
 
 dnl These are defined in files in m4/
 tinc_TUNTAP
+
 tinc_OPENSSL
-CXXFLAGS="$CXXFLAGS -I$openssl_include"
+if test "x$openssl_include" != x; then
+   CXXFLAGS="$CXXFLAGS -I$openssl_include"
+fi
 dnl tinc_ZLIB
 
 AC_ARG_ENABLE(rohc,
@@ -262,7 +267,7 @@
   AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
 )
 
-HMAC=12    dnl see also the AC_HELP_STRING
+HMAC=8    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 12). Allowed values are 4, 8, 12, 16.])],
   HMAC=$enableval