]> git.ipfire.org Git - thirdparty/ipset.git/commitdiff
configure.ac: Better match for ipv6_skip_exthdr() frag_offp arg presence
authorSerhey Popovych <serhe.popovych@gmail.com>
Fri, 29 Nov 2019 09:21:27 +0000 (11:21 +0200)
committerJozsef Kadlecsik <kadlec@netfilter.org>
Mon, 9 Dec 2019 10:00:03 +0000 (11:00 +0100)
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 <serhe.popovych@gmail.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
configure.ac

index 246110d52da72d082fa1002fc94a9f4d76468e6c..e0025df9a014e1c3514ab7f179e70a7cbcde2597 100644 (file)
@@ -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