X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=m4%2Ftuntap.m4;h=8c14a9bcb179f8339bfd1de42461c9966015fedb;hp=7da8e46a25d03d39a7a44377f3e71ee44319912f;hb=5219ee25a248fe26055e54215c5027cbf8483439;hpb=7fc068fe5421f7ec556b0b7db6f814e18b3326a4

diff --git a/m4/tuntap.m4 b/m4/tuntap.m4
index 7da8e46a..8c14a9bc 100644
--- a/m4/tuntap.m4
+++ b/m4/tuntap.m4
@@ -1,37 +1,44 @@
 dnl Check to find out whether the running kernel has support for TUN/TAP
 
-AC_DEFUN(tinc_TUNTAP,
+AC_DEFUN([tinc_TUNTAP],
 [
-AC_ARG_WITH(kernel,
-  [  --with-kernel=dir       give the directory with kernel sources]
-  [                        (default: /usr/src/linux)],
-  kerneldir="$withval",
-  kerneldir="/usr/src/linux"
-)
-
-AC_CACHE_CHECK([for linux/if_tun.h], tinc_cv_linux_if_tun_h,
-[ 
-  AC_TRY_COMPILE([#include "$kerneldir/include/linux/if_tun.h"],
-    [int a = IFF_TAP;],
-    if_tun_h="\"$kerneldir/include/linux/if_tun.h\"",
-    [AC_TRY_COMPILE([#include <linux/if_tun.h>],
-      [int a = IFF_TAP;],
-      if_tun_h="<linux/if_tun.h>",
-      if_tun_h="no"
-    )]
+  AC_ARG_WITH(kernel,
+    AS_HELP_STRING([--with-kernel=DIR], [give the directory with kernel sources (default: /usr/src/linux)]),
+    kerneldir="$withval",
+    kerneldir="/usr/src/linux"
   )
-
-  if test $if_tun_h = no; then
-    tinc_cv_linux_if_tun_h=none
-  else
-    tinc_cv_linux_if_tun_h=$if_tun_h
+  
+  AC_CACHE_CHECK([for linux/if_tun.h], tinc_cv_linux_if_tun_h,
+  [ 
+    AC_COMPILE_IFELSE(
+      AC_LANG_PROGRAM([
+        #include "$kerneldir/include/linux/if_tun.h"
+	int a = IFF_TAP;
+      ]),
+      [if_tun_h="\"$kerneldir/include/linux/if_tun.h\""],
+      [AC_COMPILE_IFELSE(
+        AC_LANG_PROGRAM([
+	  #include <linux/if_tun.h>
+          int a = IFF_TAP;
+	]),
+        [if_tun_h="default"],
+        [if_tun_h="no"]
+      )]
+    )
+  
+    if test $if_tun_h = no; then
+      tinc_cv_linux_if_tun_h=none
+    else
+      tinc_cv_linux_if_tun_h="$if_tun_h"
+    fi
+  ])
+  
+  if test $tinc_cv_linux_if_tun_h != none; then
+    AC_DEFINE(HAVE_TUNTAP, 1, [Universal tun/tap driver present])
+    if test $tinc_cv_linux_if_tun_h != default; then
+     AC_DEFINE_UNQUOTED(LINUX_IF_TUN_H, $tinc_cv_linux_if_tun_h, [Location of if_tun.h])
+    fi
   fi
-])
-
-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)
+  AC_SUBST(HAVE_TUNTAP)
 ])