diff options
| author | Florian Westphal <fw@strlen.de> | 2013-07-15 16:35:08 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2013-07-16 00:54:05 +0200 |
| commit | 51340f7b6a1103b12d86ef488f7140406d80401e (patch) | |
| tree | 7409fe790b3c57097a50db28bead4aa87ff37a53 /extensions/GNUmakefile.in | |
| parent | a963e217528d2849f32ec6516a1f82450c65f588 (diff) | |
extensions: libxt_connlabel: use libnetfilter_conntrack
Pablo suggested to make it depend on lnf-conntrack, and get rid of
the example config file as well.
The problem is that the file must be in a fixed path,
/etc/xtables/connlabel.conf, else userspace needs to "guess-the-right-file"
when translating names to their bit values (and vice versa).
Originally "make install" did put an example file into /etc/xtables/,
but distributors complained about iptables ignoring the sysconfdir.
So rather remove the example file, the man-page explains the format,
and connlabels are inherently system-specific anyway.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'extensions/GNUmakefile.in')
| -rw-r--r-- | extensions/GNUmakefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index 1ae7f74f..14e7c576 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -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} -o $@ -c $<; + ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} ${$*_CFLAGADD} -o $@ -c $<; libxt_NOTRACK.so: libxt_CT.so ln -fs $< $@ @@ -103,6 +103,9 @@ 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@ # # Static bits |