do not include libmnl if nfacct is not enabled

diff --git a/configure.ac b/configure.ac
index d66f4d609aaa58f6da6fdefe202647f256f7ad68..251eab3e6efe09d45fe118c7636cc8c1ff16eee8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -372,12 +372,6 @@ PKG_CHECK_MODULES(
     [have_libnetfilter_acct=no]
 )
 
-if test "${have_libnetfilter_acct}" = "yes"; then
-    AC_DEFINE([HAVE_LIBNETFILTER_ACCT], [1], [libnetfilter_acct usability])
-    OPTIONAL_NFACCT_CLFAGS="${OPTIONAL_NFACCT_CLFAGS} ${NFACCT_CFLAGS}"
-    OPTIONAL_NFACCT_LIBS="${OPTIONAL_NFACCT_LIBS} ${NFACCT_LIBS}"
-fi
-
 PKG_CHECK_MODULES(
     [LIBMNL],
     [libmnl],
@@ -385,12 +379,6 @@ PKG_CHECK_MODULES(
     [have_libmnl=no]
 )
 
-if test "${have_libmnl}" = "yes"; then
-    AC_DEFINE([HAVE_LIBMNL], [1], [libmnl usability])
-    OPTIONAL_NFACCT_CLFAGS="${OPTIONAL_NFACCT_CLFAGS} ${LIBMNL_CFLAGS}"
-    OPTIONAL_NFACCT_LIBS="${OPTIONAL_NFACCT_LIBS} ${LIBMNL_LIBS}"
-fi
-
 test "${enable_plugin_nfacct}" = "yes" -a "${have_libnetfilter_acct}" != "yes" && \
     AC_MSG_ERROR([netfilter_acct required but not found])
 
@@ -400,6 +388,8 @@ test "${enable_plugin_nfacct}" = "yes" -a "${have_libmnl}" != "yes" && \
 AC_MSG_CHECKING([if nfacct.plugin should be enabled])
 if test "${enable_plugin_nfacct}" != "no" -a "${have_libnetfilter_acct}" = "yes" -a "${have_libmnl}" = "yes"; then
     enable_plugin_nfacct="yes"
+    AC_DEFINE([HAVE_LIBMNL], [1], [libmnl usability])
+    AC_DEFINE([HAVE_LIBNETFILTER_ACCT], [1], [libnetfilter_acct usability])
     AC_DEFINE([INTERNAL_PLUGIN_NFACCT], [1], [nfacct plugin usability])
     OPTIONAL_NFACCT_CLFAGS="${NFACCT_CFLAGS} ${LIBMNL_CFLAGS}"
     OPTIONAL_NFACCT_LIBS="${NFACCT_LIBS} ${LIBMNL_LIBS}"