From patchwork Wed Mar 6 15:00:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 225520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 590A82C0340 for ; Thu, 7 Mar 2013 02:00:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757611Ab3CFPAk (ORCPT ); Wed, 6 Mar 2013 10:00:40 -0500 Received: from 33.106-14-84.ripe.coltfrance.com ([84.14.106.33]:52427 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757481Ab3CFPAk (ORCPT ); Wed, 6 Mar 2013 10:00:40 -0500 Received: from schnaps.dev.6wind.com (unknown [10.16.0.249]) by proxy.6wind.com (Postfix) with ESMTPS id A59C5281E9; Wed, 6 Mar 2013 16:00:38 +0100 (CET) Received: from root by schnaps.dev.6wind.com with local (Exim 4.80) (envelope-from ) id 1UDFpe-0004aR-Gd; Wed, 06 Mar 2013 16:00:38 +0100 From: Nicolas Dichtel To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Nicolas Dichtel Subject: [PATCH iptables-nftables] iptables: fix compil when lib[mnl|nftables] are not in standard path Date: Wed, 6 Mar 2013 16:00:31 +0100 Message-Id: <1362582031-17576-1-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 1.8.0.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 --- configure.ac | 2 +- iptables/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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