From patchwork Sun Jul 21 15:30:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Oester X-Patchwork-Id: 260528 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 171602C00BF for ; Mon, 22 Jul 2013 01:30:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755643Ab3GUPar (ORCPT ); Sun, 21 Jul 2013 11:30:47 -0400 Received: from mail-pb0-f53.google.com ([209.85.160.53]:44245 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755548Ab3GUPaq (ORCPT ); Sun, 21 Jul 2013 11:30:46 -0400 Received: by mail-pb0-f53.google.com with SMTP id xb12so6188197pbc.12 for ; Sun, 21 Jul 2013 08:30:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent:x-gm-message-state; bh=KD7n8Nkix6xvcSqPMc+zFPEoz4fQNHH1Bj6kAIeD918=; b=mpbvE0tht5Xu6os2MW722XXBYs6ppBqgLG7VAr/4S9W1h7Y2qvwtLRVX/l6gDlR1Au tlseRGNFjbsnVSjvvzT6FRnMiau9psdrNtCVyWXXXKSQfKlJAJyFJOpla7rakUR0ddFz fbMiQMvmZ8u7MYtvUPbKg9LQIBtMQ1RpXNoX2TBZ5sW6AMjlLL5SrlEPXkpaz4Fh4sid I6u+Hf1n3pfS4+NlGKkbzSVCWbgVnwqywl122PMKEkI159fIu+4LyyxlNn0u+T9YmeVR 5Kr6yTnNYqlZNGrEuk11AbCWJ8+Ykp1gyMKtJdaHfUxh6Z4pQc3nQD7NwmnK9wAuoquM rrzQ== X-Received: by 10.68.234.72 with SMTP id uc8mr26693685pbc.35.1374420646323; Sun, 21 Jul 2013 08:30:46 -0700 (PDT) Received: from linuxace.com (cpe-76-171-169-87.socal.res.rr.com. [76.171.169.87]) by mx.google.com with ESMTPSA id sz3sm2453825pbc.5.2013.07.21.08.30.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 21 Jul 2013 08:30:44 -0700 (PDT) Date: Sun, 21 Jul 2013 08:30:49 -0700 From: Phil Oester To: netfilter-devel@vger.kernel.org Cc: pablo@netfilter.org Subject: [PATCH] iptables: additional include path required after UAPI changes Message-ID: <20130721153049.GA8444@linuxace.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQliFq/q5S1QeFnIVIPthgixknPt9hGe8H34d+qwlzBaixYpzfcOi3tA2mO2FvAP7u19leiU Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org After kernel commit 607ca46e (UAPI: (Scripted) Disintegrate include/linux), using the "--with-kernel" argument to build iptables stopped working due to the missing #ifdefs in the original files. We need to make sure the UAPI include dir is listed before the original location. Leaving both allows support for old and new kernels. This fixes bug #833. Phil Signed-off-by: Phil Oester diff --git a/configure.ac b/configure.ac index be216b0..5ed5165 100644 --- a/configure.ac +++ b/configure.ac @@ -114,10 +114,10 @@ regular_CPPFLAGS="${largefile_cppflags} -D_REENTRANT \ -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" -DXTABLES_INTERNAL"; kinclude_CPPFLAGS=""; if [[ -n "$kbuilddir" ]]; then - kinclude_CPPFLAGS="$kinclude_CPPFLAGS -I$kbuilddir/include"; + kinclude_CPPFLAGS="$kinclude_CPPFLAGS -I$kbuilddir/include/uapi -I$kbuilddir/include"; fi; if [[ -n "$ksourcedir" ]]; then - kinclude_CPPFLAGS="$kinclude_CPPFLAGS -I$ksourcedir/include"; + kinclude_CPPFLAGS="$kinclude_CPPFLAGS -I$ksourcedir/include/uapi -I$ksourcedir/include"; fi; pkgdatadir='${datadir}/xtables';