Patchwork [Ulog2] Exec libmnl config check only if nfacct is enabled

login
register
mail settings
Submitter Victor Julien
Date April 5, 2013, 4:28 p.m.
Message ID <1365179294-24481-1-git-send-email-victor@inliniac.net>
Download mbox | patch
Permalink /patch/234194/
State Accepted
Headers show

Comments

Victor Julien - April 5, 2013, 4:28 p.m.
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(-)
Eric Leblond - May 12, 2013, 9:58 a.m.
Hello,

Le vendredi 05 avril 2013 à 18:28 +0200, Victor Julien a écrit :
> 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])
>  ])

It seems fine to me. Applied to my tree. I will pushed it soon.

PS: sorry for the delay

BR,
--
Eric

Patch

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])
 ])