From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 25 Oct 2012 15:14:26 +0000 (+0200)
Subject: Merge branch 'next' branch that contains new features scheduled for
X-Git-Tag: v1.4.17~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d284c1c67188dfa8a4c7a6e36eb9a10bd9c15e2;p=thirdparty%2Fiptables.git

Merge branch 'next' branch that contains new features scheduled for
Linux kernel 3.7
---

9d284c1c67188dfa8a4c7a6e36eb9a10bd9c15e2
diff --cc extensions/GNUmakefile.in
index 1cef239c,2492d184..e71e3ff9
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@@ -95,12 -96,8 +95,13 @@@ lib%.so: lib%.o
  lib%.oo: ${srcdir}/lib%.c
  	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
  
 +libxt_NOTRACK.so: libxt_CT.so
 +	ln -fs $< $@
 +libxt_state.so: libxt_conntrack.so
 +	ln -fs $< $@
 +
  # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
+ ip6t_NETMAP_LIBADD  = -lip6tc
  xt_RATEEST_LIBADD   = -lm
  xt_statistic_LIBADD = -lm