| From 76e230e41947576efb96e86e605bb84015cdb287 Mon Sep 17 00:00:00 2001 |
| From: Jan Engelhardt <jengelh@inai.de> |
| Date: Tue, 13 Aug 2013 19:02:06 +0000 |
| Subject: iptables: link against libnetfilter_conntrack |
| |
| Linking currently fails in --enable-static case: |
| |
| ../extensions/libext.a(libxt_connlabel.o): In function `connlabel_get_name': |
| iptables/extensions/libxt_connlabel.c:57: undefined reference to `nfct_labelmap_get_name' |
| [..] |
| It's libxtables.la(libxt_connlabel.o) using libnetfilter_conntrack. |
| |
| If libnetfilter_conntrack is not found, @libnetfilter_conntrack_CFLAGS@ |
| and @libnetfilter_conntrack_LIBS@ (and their ${} ones) should be empty, |
| therefore producing no harm to include unconditionally. |
| |
| [Gustavo: update for iptables 1.4.21] |
| Reported-and-tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar> |
| Signed-off-by: Florian Westphal <fw@strlen.de> |
| --- |
| diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in |
| index 14e7c57..780e715 100644 |
| --- a/extensions/GNUmakefile.in |
| +++ b/extensions/GNUmakefile.in |
| @@ -21,7 +21,7 @@ regular_CPPFLAGS = @regular_CPPFLAGS@ |
| kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ |
| |
| AM_CFLAGS = ${regular_CFLAGS} |
| -AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} |
| +AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ |
| AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ |
| AM_LDFLAGS = @noundef_LDFLAGS@ |
| |
| @@ -93,7 +93,7 @@ lib%.so: lib%.oo |
| ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD}; |
| |
| lib%.oo: ${srcdir}/lib%.c |
| - ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} ${$*_CFLAGADD} -o $@ -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 $< $@ |
| @@ -103,9 +103,7 @@ libxt_state.so: libxt_conntrack.so |
| # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD |
| xt_RATEEST_LIBADD = -lm |
| xt_statistic_LIBADD = -lm |
| -@HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@ |
| - |
| -@HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_CFLAGADD = @libnetfilter_conntrack_CFLAGS@ |
| +xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@ |
| |
| # |
| # Static bits |
| diff --git a/libxtables/Makefile.am b/libxtables/Makefile.am |
| index c5795fe..4267cb5 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} |
| -- |
| cgit v0.9.2 |
| |
