--- gvpe/configure.ac	2003/10/15 01:35:45	1.14
+++ gvpe/configure.ac	2004/01/17 01:18:36	1.21
@@ -3,7 +3,7 @@
 AC_PREREQ(2.57)
 AC_INIT(src/vped.C)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(vpe, 1.2)
+AM_INIT_AUTOMAKE(vpe, 1.4)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -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])
      ;;
@@ -133,6 +135,8 @@
 AC_MSG_RESULT($IFTYPE/$IFSUBTYPE)
 AC_SUBST(IFTYPE,$IFTYPE)
 AC_SUBST(IFSUBTYPE,$IFSUBTYPE)
+AC_DEFINE_UNQUOTED(IFTYPE,"$IFTYPE",[kernel interface type])
+AC_DEFINE_UNQUOTED(IFSUBTYPE,"$IFSUBTYPE",[kernel interface subtype])
 
 AC_CACHE_SAVE
 
@@ -144,7 +148,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 sys/cygwin.h arpa/inet.h \
-        sys/poll.h sys/mman.h netinet/in.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>
@@ -202,7 +206,7 @@
 AC_HEADER_STDC
 
 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_CHECK_FUNCS(asprintf daemon get_current_dir_name putenv select strerror strsignal strtol unsetenv mlockall)
 
 AC_FUNC_ALLOCA
 
@@ -223,8 +227,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 +269,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
@@ -324,13 +331,13 @@
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
 fi
 
-if $CXX -v --help 2>&1 | grep -q ffunction-sections; then
-   CXXFLAGS="$CXXFLAGS -ffunction-sections"
-fi
-
-if $LD -v --help 2>&1 | grep -q gc-sections; then
-   LDFLAGS="$LDFLAGS -Wl,--gc-sections"
-fi
+dnl if $CXX -v --help 2>&1 | grep -q ffunction-sections; then
+dnl    CXXFLAGS="$CXXFLAGS -ffunction-sections"
+dnl fi
+dnl 
+dnl if $LD -v --help 2>&1 | grep -q gc-sections; then
+dnl    LDFLAGS="$LDFLAGS -Wl,--gc-sections"
+dnl fi
 
 AC_CONFIG_COMMANDS_POST([