diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2012-11-22 00:05:42 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2012-11-22 21:28:11 +0100 |
| commit | 0c3884a5e10ede59969383f87320ff06470c1b2d (patch) | |
| tree | 9332de80656b12f2c7960e1ed388c2f169464053 | |
| parent | 3c77704723755f8dcd63c6150a2ba3e4aa8cd8a9 (diff) | |
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.
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
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 |