diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | iptables/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index eb2c367b..cbbf66df 100644 --- a/configure.ac +++ b/configure.ac @@ -123,7 +123,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 11c501b9..5d653545 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 @@ -33,7 +33,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 |