X-Git-Url: https://arthur.barton.de/gitweb/?p=netdata.git;a=blobdiff_plain;f=configure.ac;h=663f0a395a191049879c1a91ef1e15b5090577c5;hp=e8fe1974c948e87770561c8d19a834246ea73ed9;hb=f74a2240c8b8e7a469170d6300bfd4fb79ef52c1;hpb=fa57c9e50d49f3b51dcd9a5f7ec8798153af5992

diff --git a/configure.ac b/configure.ac
index e8fe1974..663f0a39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 define([VERSION_MAJOR], [1])
-define([VERSION_MINOR], [5])
+define([VERSION_MINOR], [6])
 define([VERSION_FIX], [1])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
 define([VERSION_SUFFIX], [_rolling])
@@ -51,7 +51,7 @@ AC_ARG_ENABLE(
     [plugin-nfacct],
     [AS_HELP_STRING([--enable-plugin-nfacct], [enable nfacct plugin, requires root])],
     ,
-    [enable_plugin_nfacct="detect"]
+    [enable_plugin_nfacct="no"]
 )
 AC_ARG_ENABLE(
     [plugin-freeipmi],
@@ -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}"