Check for sys/uio.h, net/if_tun.h and net/if_tap.h

diff --git a/Makefile.am b/Makefile.am
index 0667a877e07094e617eb2c7d73147e980368a2bf..306a0ed024349906baf659ece310cd515c9b2d20 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS =  m4 lib src doc po
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = config.rpath mkinstalldirs system.h COPYING.README depcomp
+EXTRA_DIST = config.rpath mkinstalldirs have.h system.h COPYING.README depcomp
 
 ChangeLog:
        svn log > ChangeLog

diff --git a/configure.in b/configure.in
index 4bddb0b83218c23c43b65903c689b26a1060e9da..55d0f00c3cbc8ab150dc9882c4ffaf0e58b385d8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -46,11 +46,11 @@ case $host_os in
   ;;
   *freebsd*)
     AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
-    [ rm -f src/device.c; ln -sf freebsd/device.c src/device.c ]
+    [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
   ;;
   *darwin*)
     AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
-    [ rm -f src/device.c; ln -sf darwin/device.c src/device.c ]
+    [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
   ;;
   *solaris*)
     AC_DEFINE(HAVE_SOLARIS, 1, [Solaris/SunOS])
@@ -58,11 +58,16 @@ case $host_os in
   ;;
   *openbsd*)
     AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD])
-    [ rm -f src/device.c; ln -sf openbsd/device.c src/device.c ]
+    [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
   ;;
   *netbsd*)
     AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
-    [ rm -f src/device.c; ln -sf netbsd/device.c src/device.c ]
+    [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
+  ;;
+  *bsd*)
+    AC_MSG_WARN("Unknown BSD variant, tinc might not compile or work!")
+    AC_DEFINE(HAVE_BSD, 1, [Unknown BSD variant])
+    [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
   ;;
   *cygwin*)
     AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
@@ -93,7 +98,7 @@ dnl Checks for header files.
 dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies.
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/param.h sys/time.h sys/socket.h sys/wait.h sys/mman.h netdb.h arpa/inet.h])
+AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h sys/uio.h sys/wait.h netdb.h arpa/inet.h])
 AC_CHECK_HEADERS([net/if.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h],
   [], [], [#include "have.h"]
 )
@@ -122,7 +127,7 @@ dnl Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog],
+AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog writev],
   [], [], [#include "have.h"]
 )
 jm_FUNC_MALLOC

diff --git a/have.h b/have.h
index e5b0af832b75291fdc49193783e789dd05c931d9..0befb3a5e8ddcfec605c5526c59a234b7374b43a 100644 (file)
--- a/have.h
+++ b/have.h
@@ -77,6 +77,10 @@
 #include <sys/param.h>
 #endif
 
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
 /* SunOS really wants sys/socket.h BEFORE net/if.h,
    and FreeBSD wants these lines below the rest. */
 
@@ -92,6 +96,14 @@
 #include <net/if.h>
 #endif
 
+#ifdef HAVE_NET_IF_TUN_H
+#include <net/if_tun.h>
+#endif
+
+#ifdef HAVE_NET_IF_TAP_H
+#include <net/if_tap.h>
+#endif
+
 #ifdef HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
 #endif