From 11f8465dd9a4f81b43a31f1cb6a7fc2d76bb7838 Mon Sep 17 00:00:00 2001
From: Ivo Timmermans <ivo@lychnis.net>
Date: Sun, 18 Feb 2001 02:13:26 +0000
Subject: [PATCH] tinc_TUNTAP now substitutes the values outside the
 AC_CACHE_CHECK block.  configure should now correctly set HAVE_TUNTAP.

---
 m4/tuntap.m4 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/m4/tuntap.m4 b/m4/tuntap.m4
index 605ebef4..2c1ee35c 100644
--- a/m4/tuntap.m4
+++ b/m4/tuntap.m4
@@ -10,11 +10,14 @@ AC_CACHE_CHECK([for linux/if_tun.h], tinc_cv_linux_if_tun_h,
    if test $if_tun_h = no; then
     tinc_cv_linux_if_tun_h=none
   else
-    AC_DEFINE(HAVE_TUNTAP)
-    AC_DEFINE_UNQUOTED(LINUX_IF_TUN_H, "$if_tun_h")
-    AC_SUBST(LINUX_IF_TUN_H)
     tinc_cv_linux_if_tun_h=$if_tun_h
   fi
-  AC_SUBST(HAVE_TUNTAP)
 ])
+
+if test $tinc_cv_linux_if_tun_h != none; then
+  AC_DEFINE(HAVE_TUNTAP)
+  AC_DEFINE_UNQUOTED(LINUX_IF_TUN_H, "$tinc_cv_linux_if_tun_h")
+  AC_SUBST(LINUX_IF_TUN_H)
+fi
+AC_SUBST(HAVE_TUNTAP)
 ])
-- 
2.20.1