1From 26090b3dbcdf6a11e60535da949b726a6e86426d Mon Sep 17 00:00:00 2001 2From: "Maxin B. John" <maxin.john@intel.com> 3Date: Tue, 21 Feb 2017 11:49:07 +0200 4Subject: [PATCH] configure.ac: 5 only-check-conntrack-when-libnfnetlink-enabled.patch 6 7Package libnetfilter-conntrack depends on package libnfnetlink. iptables 8checks package libnetfilter-conntrack whatever its package config 9libnfnetlink is enabled or not. When libnfnetlink is disabled but 10package libnetfilter-conntrack exists, it fails randomly with: 11 12In file included from 13.../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0: 14 15.../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42: 16fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory 17 18compilation terminated. 19GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed 20Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it. 21 22Upstream-Status: Pending 23 24Signed-off-by: Kai Kang <kai.kang@windriver.com> 25Signed-off-by: Maxin B. John <maxin.john@intel.com> 26--- 27 configure.ac | 6 ++++-- 28 1 file changed, 4 insertions(+), 2 deletions(-) 29 30diff --git a/configure.ac b/configure.ac 31index 03ddc50..523caea 100644 32--- a/configure.ac 33+++ b/configure.ac 34@@ -172,10 +172,12 @@ if test "$nftables" != 1; then 35 fi 36 37 if test "x$enable_connlabel" = "xyes"; then 38- PKG_CHECK_MODULES([libnetfilter_conntrack], 39+ nfconntrack=0 40+ AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ 41+ PKG_CHECK_MODULES([libnetfilter_conntrack], 42 [libnetfilter_conntrack >= 1.0.6], 43 [nfconntrack=1], [nfconntrack=0]) 44- 45+ ]) 46 if test "$nfconntrack" -ne 1; then 47 blacklist_modules="$blacklist_modules connlabel"; 48 echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; 49-- 502.4.0 51 52