--- gvpe/configure	2003/10/15 00:34:18	1.4
+++ gvpe/configure	2003/10/16 20:35:14	1.8
@@ -870,10 +870,11 @@
   --enable-iftype=TYPE/SUBTYPE
                           Use kernel/net device interface TYPE/SUBTYPE.
                           Working combinations are: "native/linux"
-                          "tincd/linux" "tincd/freebsd"; Untested combinations
-                          are: "tincd/netbsd" "tincd/darwin" "tincd/solaris"
-                          "tincd/openbsd" "tincd/cygwin"; Broken combinations
-                          are: "native/cygwin"; The default is to autodetect.
+                          "tincd/linux" "tincd/freebsd" "tincd/openbsd"
+                          "tincd/darwin" "native/cygwin"; Untested
+                          combinations are: "tincd/netbsd" "tincd/solaris"
+                          "tincd/mingw"; Broken combinations are:
+                          "tincd/cygwin"; The default is to autodetect.
   --enable-rohc           enable robust header compression (rfc3095).
   --enable-icmp           enable icmp protocol support (default disabled).
   --enable-tcp            enable tcp protocol support (default disabled).
@@ -6285,7 +6286,7 @@
 
      ;;
      *cygwin*)
-       IFTYPE=tincd
+       IFTYPE=native
        IFSUBTYPE=cygwin
 
 cat >>confdefs.h <<\_ACEOF
@@ -6986,7 +6987,7 @@
 
 
 for ac_header in 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 \
+	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
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -8749,6 +8750,7 @@
 
 
 
+
   tinc_ac_save_CPPFLAGS="$CPPFLAGS"
 
 
@@ -9219,7 +9221,9 @@
 fi
 
 
-CXXFLAGS="$CXXFLAGS -I$openssl_include"
+if test "x$openssl_include" != x; then
+   CXXFLAGS="$CXXFLAGS -I$openssl_include"
+fi
 
 # Check whether --enable-rohc or --disable-rohc was given.
 if test "${enable_rohc+set}" = set; then
@@ -9276,7 +9280,7 @@
 
 fi;
 
-HMAC=12    # Check whether --enable-hmac-length or --disable-hmac-length was given.
+HMAC=8    # Check whether --enable-hmac-length or --disable-hmac-length was given.
 if test "${enable_hmac_length+set}" = set; then
   enableval="$enable_hmac_length"
   HMAC=$enableval