From patchwork Fri Apr 5 16:28:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Julien X-Patchwork-Id: 234194 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 C015F2C00BB for ; Sat, 6 Apr 2013 03:28:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161985Ab3DEQ2f (ORCPT ); Fri, 5 Apr 2013 12:28:35 -0400 Received: from static-27.netfusion.at ([83.215.238.27]:39549 "EHLO tulpe.vuurmuur.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161984Ab3DEQ2e (ORCPT ); Fri, 5 Apr 2013 12:28:34 -0400 Received: from z210.inliniac.lan (a80-101-90-58.adsl.xs4all.nl [80.101.90.58]) (authenticated bits=0) by tulpe.vuurmuur.org (8.14.3/8.14.3/Debian-9.4) with ESMTP id r35GElPw006570 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 5 Apr 2013 18:14:53 +0200 From: Victor Julien To: netfilter-devel@vger.kernel.org Cc: Victor Julien Subject: [Ulog2 PATCH] Exec libmnl config check only if nfacct is enabled Date: Fri, 5 Apr 2013 18:28:14 +0200 Message-Id: <1365179294-24481-1-git-send-email-victor@inliniac.net> X-Mailer: git-send-email 1.7.10.4 X-MailScanner-ID: r35GElPw006570 X-Inliniac-MailScanner: Not scanned: please contact your Internet E-Mail Service Provider for details X-Inliniac-MailScanner-From: victor@inliniac.net MailScanner-NULL-Check: 1365783298.08691@TQmzeNewVAbuJ0ni8G3xsg X-Spam-Status: No Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org In case nfacct is not enabled in ulogd2, libmnl is not used. So it shouldn't be a hard global dependency, but instead only a dependency in case nfacct is enabled. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c94704b..54a08aa 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,6 @@ AC_SUBST([regular_CFLAGS]) dnl Check for the right nfnetlink version PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1]) -PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3]) AC_ARG_ENABLE(nflog, AS_HELP_STRING([--enable-nflog], [Enable nflog module [default=yes]]),,[enable_nflog=yes]) AS_IF([test "x$enable_nflog" = "xyes"], [ @@ -67,6 +66,7 @@ AM_CONDITIONAL([BUILD_NFCT], [test "x$enable_nfct" = "xyes"]) AC_ARG_ENABLE(nfacct, AS_HELP_STRING([--enable-nfacct], [Enable nfacct module [default=yes]]),,[enable_nfacct=yes]) AS_IF([test "x$enable_nfacct" = "xyes"], [ + PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3]) PKG_CHECK_MODULES([LIBNETFILTER_ACCT], [libnetfilter_acct >= 1.0.1]) AC_DEFINE([BUILD_NFACCT], [1], [Building nfacct module]) ])