Patchwork [iptables-nftables] iptables: fix compil when lib[mnl|nftables] are not in standard path

login
register
mail settings
Submitter Nicolas Dichtel
Date March 6, 2013, 3 p.m.
Message ID <1362582031-17576-1-git-send-email-nicolas.dichtel@6wind.com>
Download mbox | patch
Permalink /patch/225520/
State Accepted
Headers show

Comments

Nicolas Dichtel - March 6, 2013, 3 p.m.
There was several problems:
 a typo in the configure option
 a typo in CFLAGS addon for libmnl and libnftables
 paths to lib were missing on link

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
 configure.ac         | 2 +-
 iptables/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Pablo Neira - March 14, 2013, 3:43 p.m.
On Wed, Mar 06, 2013 at 04:00:31PM +0100, Nicolas Dichtel wrote:
> There was several problems:
>  a typo in the configure option
>  a typo in CFLAGS addon for libmnl and libnftables
>  paths to lib were missing on link

Also applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/configure.ac b/configure.ac
index cbd129c..48a0d54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,7 @@  PKG_CHECK_MODULES([libmnl], [libmnl >= 1.0],
 	[mnl=1], [mnl=0])
 AM_CONDITIONAL([HAVE_LIBMNL], [test "$mnl" = 1])
 
-PKG_CHECK_MODULES([libnfables], [libnftables >= 1.0],
+PKG_CHECK_MODULES([libnftables], [libnftables >= 1.0],
 	[nftables=1], [nftables=0])
 AM_CONDITIONAL([HAVE_LIBNFTABLES], [test "$nftables" = 1])
 
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index 6738cd0..3995dd4 100644
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -1,7 +1,7 @@ 
 # -*- Makefile -*-
 
 AM_CFLAGS        = ${regular_CFLAGS}
-AM_CPPFLAGS      = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CPPFLAGS} ${libnftables_CPPFLAGS}
+AM_CPPFLAGS      = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftables_CFLAGS}
 AM_YFLAGS = -d
 
 xtables_multi_SOURCES  = xtables-multi.c iptables-xml.c
@@ -32,7 +32,7 @@  xtables_multi_SOURCES += xtables-save.c xtables-restore.c \
 			 nft-shared.c nft-ipv4.c nft-ipv6.c \
 			 xtables-config-parser.y xtables-config-syntax.l \
 			 xtables-config.c xtables-events.c
-xtables_multi_LDADD   += -lmnl -lnftables
+xtables_multi_LDADD   += -lmnl -lnftables ${libmnl_LIBS} ${libnftables_LIBS}
 xtables_multi_CFLAGS  += -DENABLE_NFTABLES
 # yacc and lex generate dirty code
 xtables_multi-xtables-config-parser.o xtables_multi-xtables-config-syntax.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls