forked from pool/ipset
Jan Engelhardt
25a80326cc
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=17
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From a6addc5519c0de9bb939317086ca5b6b0df9039f Mon Sep 17 00:00:00 2001
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: Wed, 21 Nov 2012 23:39:37 +0100
|
|
Subject: [PATCH] build: support for Linux 3.7 UAPI
|
|
|
|
In Linux 3.7, nfnetlink.h moved below include/uapi/. Make configure
|
|
recognize that. Furthermore, we can drop the unnecessary indirection
|
|
via backticks and just ask grep directly if there was any result.
|
|
---
|
|
configure.ac | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 7a6aa33..dea392d 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -68,7 +68,8 @@ fi
|
|
|
|
AC_PROG_GREP
|
|
|
|
-if test "X`$GREP 'NFNL_SUBSYS_IPSET' $ksourcedir/include/linux/netfilter/nfnetlink.h`" = "X"
|
|
+if ! $GREP -q "NFNL_SUBSYS_IPSET" "$ksourcedir/include/linux/netfilter/nfnetlink.h" && \
|
|
+ ! $GREP -q "NFNL_SUBSYS_IPSET" "$ksourcedir/include/uapi/linux/netfilter/nfnetlink.h";
|
|
then
|
|
AC_MSG_ERROR([The kernel source directory $ksourcedir is not patched with netlink.patch to support ipset])
|
|
fi
|
|
--
|
|
1.7.10.4
|
|
|