summaryrefslogtreecommitdiffstats
path: root/libxtables
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2013-11-23 23:50:17 +0100
committerFlorian Westphal <fw@strlen.de>2013-11-23 23:50:17 +0100
commit73dcee35a394b0fcf83f99d278bc03515de07d4b (patch)
treec7adf02dcfeceb736ff151ab029f82670eec361e /libxtables
parent482c6d3731e2681cb4baae835c294840300197e6 (diff)
parent76e230e41947576efb96e86e605bb84015cdb287 (diff)
Merge branch 'stable-1.4.20'
... to get 76e230e ('iptables: link against libnetfilter_conntrack'), else static build doesn't work. Conflicts: extensions/GNUmakefile.in [ CPPFLAGS was added in master, so keep it ] Reported-By: Gustavo Zacarias <gustavo@zacarias.com.ar>
Diffstat (limited to 'libxtables')
-rw-r--r--libxtables/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libxtables/Makefile.am b/libxtables/Makefile.am
index c5795fef..4267cb5f 100644
--- a/libxtables/Makefile.am
+++ b/libxtables/Makefile.am
@@ -10,7 +10,7 @@ libxtables_la_LIBADD =
if ENABLE_STATIC
# With --enable-static, shipped extensions are linked into the main executable,
# so we need all the LIBADDs here too
-libxtables_la_LIBADD += -lm
+libxtables_la_LIBADD += -lm ${libnetfilter_conntrack_LIBS}
endif
if ENABLE_SHARED
libxtables_la_CFLAGS = ${AM_CFLAGS}