tuntap: Do not build on non-Linux platforms.

Ideally this would be replaced with similar functionality elsewhere,
but for now this change fixes the FTBFS on Debian hurd-* and
kfreebsd-*.

diff --git a/Makefile b/Makefile
index b457d711b0b519333abb0534469c51f12fbd7524..74fc544ad13fa7a8feb90bf7288f6ff5b7803427 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
 
-SUBDIRS=       base adns hbytes cdb crypto dgram tuntap
+SUBDIRS=       base adns hbytes cdb crypto dgram
+
+ifneq ($(wildcard /usr/include/linux/if_tun.h),)
+SUBDIRS+=      tuntap
+endif
 
 ifneq ($(wildcard /usr/include/wiringPi.h /usr/include/arm-*/wiringPi.h),)
 SUBDIRS+=      wiringpi

diff --git a/debian/changelog b/debian/changelog
index d1e1646c2da7653b284a56acb56f360296c7d0dc..62d951aa4d1d61815b115a91e17a1142a59d7f30 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ chiark-tcl (1.1.4~~iwj) UNRELEASED; urgency=low
   * wiringpi module.  Built only if the wiringpi headers are actually
     installed (so not in the official Debian release).
   * Update .gitignore for recent debhelper droppings.
+  * Do not build tuntap on non-Linux platforms.  Ideally this would
+    be replaced with similar functionality elsewhere, but for now
+    this change fixes the FTBFS on Debian hurd-* and kfreebsd-*.
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 24 Jan 2017 13:14:06 +0000