diff options
| author | Phil Oester <kernel@linuxace.com> | 2013-07-21 08:30:49 -0700 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-24 20:45:08 +0200 |
| commit | 59bbc59fd2fbbb7a51ed19945d82172890bc40f9 (patch) | |
| tree | 382507445e3f96e9ae4b65fe5bf336ee20e5be10 | |
| parent | 7b26bafb9be05a23b47653640aadbb61d0032665 (diff) | |
| download | android_external_iptables-59bbc59fd2fbbb7a51ed19945d82172890bc40f9.tar.gz android_external_iptables-59bbc59fd2fbbb7a51ed19945d82172890bc40f9.tar.bz2 android_external_iptables-59bbc59fd2fbbb7a51ed19945d82172890bc40f9.zip | |
build: additional include path required after UAPI changes
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.
Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
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'; |