From a1ccbae83744041bddf4038323a3428e8a20ef72 Mon Sep 17 00:00:00 2001 From: Serhey Popovych Date: Fri, 29 Nov 2019 11:21:27 +0200 Subject: configure.ac: Better match for ipv6_skip_exthdr() frag_offp arg presence On older kernels (i.e. ones before commit 5c3a0fd7d0fc ("ip*.h: Remove extern from function prototypes") in upstream since v3.13) we fail to match number of arguments ipv6_skip_exthdr() correctly. Configure chooses 3 args, while function has actually 4 args. This happens because on these kernels tab (\t) is used for intendation between function result type and function name. Fix by matching either space for kernels with mentioned change or tab for older kernels to select number of arguments correctly. Signed-off-by: Serhey Popovych Signed-off-by: Jozsef Kadlecsik --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 246110d..e0025df 100644 --- a/configure.ac +++ b/configure.ac @@ -325,7 +325,7 @@ fi AC_MSG_CHECKING([kernel source for ipv6_skip_exthdr args]) if test -f $ksourcedir/include/net/ipv6.h && \ - $AWK '/ ipv6_skip_exthdr\(/,/\)/' $ksourcedir/include/net/ipv6.h | $GREP -q 'frag_offp'; then + $AWK '/( |\t)ipv6_skip_exthdr\(/,/\)/' $ksourcedir/include/net/ipv6.h | $GREP -q 'frag_offp'; then AC_MSG_RESULT(4 args) AC_SUBST(HAVE_IPV6_SKIP_EXTHDR_ARGS, 4) else -- cgit v1.2.3