diff options
| author | Jamal Hadi Salim <hadi@cyberus.ca> | 2009-02-07 08:19:20 -0500 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-19 09:02:13 -0800 |
| commit | 63c7d26f941df1c7aa4a18bac5b3a777bc66216a (patch) | |
| tree | 94959e43b7ef102769b77123a679843108eeeea9 /tc/Makefile | |
| parent | 46a6573259f46f86eb0048a2c805b24ff4183fa6 (diff) | |
| download | android_external_iproute2-63c7d26f941df1c7aa4a18bac5b3a777bc66216a.tar.gz android_external_iproute2-63c7d26f941df1c7aa4a18bac5b3a777bc66216a.tar.bz2 android_external_iproute2-63c7d26f941df1c7aa4a18bac5b3a777bc66216a.zip | |
Breakage noticed when debian upgraded to xtables (iptables > 1.4.1)
Many thanks to Yevgeny Kosarzhevsky <yevg@pisem.net> for reporting
and a lot of testing
Thanks to Jan Engelhardt <jengelh@medozas.de> for a lot of advice
Thanks to Denys Fedoryschenko <denys@visp.net.lb> for some sample
code that he tried and thanks to Andreas Henriksson <andreas@fatal.se>
(who maintains iproute2 on debian) for the persistent followup.
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Diffstat (limited to 'tc/Makefile')
| -rw-r--r-- | tc/Makefile | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tc/Makefile b/tc/Makefile index eb67ede..227fc40 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -29,7 +29,6 @@ TCMODULES += q_htb.o TCMODULES += q_drr.o TCMODULES += m_gact.o TCMODULES += m_mirred.o -TCMODULES += m_ipt.o TCMODULES += m_nat.o TCMODULES += m_pedit.o TCMODULES += m_skbedit.o @@ -42,7 +41,22 @@ TCMODULES += em_cmp.o TCMODULES += em_u32.o TCMODULES += em_meta.o + +ifeq ($(TC_CONFIG_XT),y) + TCMODULES += m_xt.o + LDLIBS += -lxtables +else + ifeq ($(TC_CONFIG_XT_H),y) + CFLAGS += -DTC_CONFIG_XT_H + TCMODULES += m_xt.o + LDLIBS += -lxtables + else + TCMODULES += m_ipt.o + endif +endif + TCOBJ += $(TCMODULES) +LDLIBS += -L. -ltc -lm -ldl TCLIB := tc_core.o TCLIB += tc_red.o @@ -57,7 +71,6 @@ ifeq ($(TC_CONFIG_ATM),y) TCSO += q_atm.so endif -LDLIBS += -L. -ltc -lm -ldl LDFLAGS += -Wl,-export-dynamic |