From patchwork Wed Nov 21 23:05:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 201135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5F42C2C0089 for ; Fri, 23 Nov 2012 06:14:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753346Ab2KVTOK (ORCPT ); Thu, 22 Nov 2012 14:14:10 -0500 Received: from ares07.inai.de ([5.9.24.206]:32808 "EHLO ares07.inai.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965019Ab2KVTOJ (ORCPT ); Thu, 22 Nov 2012 14:14:09 -0500 Received: by ares07.inai.de (Postfix, from userid 25121) id 20C8196A186A; Thu, 22 Nov 2012 00:05:42 +0100 (CET) From: Jan Engelhardt To: kadlec@blackhole.kfki.hu Cc: netfilter-devel@vger.kernel.org Subject: [PATCH] build: support for Linux 3.7 UAPI Date: Thu, 22 Nov 2012 00:05:42 +0100 Message-Id: <1353539142-31631-1-git-send-email-jengelh@inai.de> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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. --- Also available via git://git.inai.de/ipset master 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