--- gvpe/configure.ac	2003/10/14 17:24:19	1.10
+++ gvpe/configure.ac	2003/10/16 14:17:01	1.17
@@ -67,12 +67,18 @@
   [AC_HELP_STRING(--enable-iftype[=TYPE/SUBTYPE], [
      Use kernel/net device interface TYPE/SUBTYPE.
      Working combinations are:
-        "native/linux" "tincd/linux" "tincd/freebsd";
+        "native/linux"
+        "tincd/linux"
+        "tincd/freebsd"
+        "tincd/openbsd"
+        "native/cygwin";
      Untested combinations are:
-        "tincd/netbsd" "tincd/darwin" "tincd/solaris"
-        "tincd/openbsd" "tincd/cygwin";
+        "tincd/netbsd"
+        "tincd/darwin"
+        "tincd/solaris"
+        "tincd/mingw";
      Broken combinations are:
-        "native/cygwin";
+        "tincd/cygwin";
      The default is to autodetect.
   ])],
   [
@@ -117,7 +123,7 @@
        AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
      ;;
      *cygwin*)
-       IFTYPE=tincd
+       IFTYPE=native
        IFSUBTYPE=cygwin
        AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
      ;;
@@ -139,7 +145,7 @@
 
 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 \
+	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], [], [],
 [
@@ -163,9 +169,6 @@
 AC_HEADER_TIME
 AC_STRUCT_TM
 
-dnl argl, could somebody catapult darwin into the 21st century???
-AC_CHECK_FUNCS(poll)
-
 AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
 [
   AC_TRY_COMPILE(
@@ -200,7 +203,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
 
@@ -221,7 +225,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,