From: Matt Burgess <matthew@linuxfromscratch.org>
Date: Tue, 2 Oct 2012 18:01:32 +0000 (+0100)
Subject: iproute2-3.6.0 assumes presence of iptables
X-Git-Tag: v3.7.0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92905c6e0d260db39b9ddd736182eaa9a44615a7;p=thirdparty%2Fiproute2.git

iproute2-3.6.0 assumes presence of iptables

Hi,

When compiling iproute2-3.6.0 on a host that doesn't have iptables available, I get the following error:

gcc -Wall -Wstrict-prototypes -O2 -I../include -DRESOLVE_HOSTNAMES
-DLIBDIR=\"/usr/lib\" -DCONFDIR=\"/etc/iproute2\" -D_GNU_SOURCE
-DCONFIG_GACT -DCONFIG_GACT_PROB -DYY_NO_INPUT   -c -o em_ipset.o
em_ipset.c
em_ipset.c:26:21: fatal error: xtables.h: No such file or directory

Fixed by the following patch, which guards the building of em_ipset.o on
the presence of suitable headers.

Thanks,

Matt.
---

diff --git a/tc/Makefile b/tc/Makefile
index ccf6acd00..389029df0 100644
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -52,7 +52,9 @@ TCMODULES += q_codel.o
 TCMODULES += q_fq_codel.o
 
 ifeq ($(TC_CONFIG_IPSET), y)
-  TCMODULES += em_ipset.o
+  ifeq ($(TC_CONFIG_XT), y)
+    TCMODULES += em_ipset.o
+  endif
 endif
 
 TCSO :=