tinc_TUNTAP now substitutes the values outside the AC_CACHE_CHECK

block.  configure should now correctly set HAVE_TUNTAP.

diff --git a/m4/tuntap.m4 b/m4/tuntap.m4
index 605ebef4a1645c1e784aef99d8d5dbaea738c659..2c1ee35cad0c509b4668a06d9ae310abd00b394a 100644 (file)
--- 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
    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
     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)

 ])
 ])