do not include libmnl if nfacct is not enabled
Costa Tsaousis (ktsaou) committed
Mar 18, 2017 at 16:30 UTC
a6206dbb7b0ffea08b71a31ef7e370eb0ff31e9f
1 file changed
+2
-12
configure.ac
+2
-12
@@ -372,12 +372,6 @@ PKG_CHECK_MODULES(
372
[have_libnetfilter_acct=no]
373
)
374
375
-if test "${have_libnetfilter_acct}" = "yes"; then
376
- AC_DEFINE([HAVE_LIBNETFILTER_ACCT], [1], [libnetfilter_acct usability])
377
- OPTIONAL_NFACCT_CLFAGS="${OPTIONAL_NFACCT_CLFAGS} ${NFACCT_CFLAGS}"
378
- OPTIONAL_NFACCT_LIBS="${OPTIONAL_NFACCT_LIBS} ${NFACCT_LIBS}"
379
-fi
380
-
375
PKG_CHECK_MODULES(
376
[LIBMNL],
377
[libmnl],
@@ -385,12 +379,6 @@ PKG_CHECK_MODULES(
379
[have_libmnl=no]
380
)
381
388
-if test "${have_libmnl}" = "yes"; then
389
- AC_DEFINE([HAVE_LIBMNL], [1], [libmnl usability])
390
- OPTIONAL_NFACCT_CLFAGS="${OPTIONAL_NFACCT_CLFAGS} ${LIBMNL_CFLAGS}"
391
- OPTIONAL_NFACCT_LIBS="${OPTIONAL_NFACCT_LIBS} ${LIBMNL_LIBS}"
392
-fi
393
-
382
test "${enable_plugin_nfacct}" = "yes" -a "${have_libnetfilter_acct}" != "yes" && \
383
AC_MSG_ERROR([netfilter_acct required but not found])
384
@@ -400,6 +388,8 @@ test "${enable_plugin_nfacct}" = "yes" -a "${have_libmnl}" != "yes" && \
388
AC_MSG_CHECKING([if nfacct.plugin should be enabled])
389
if test "${enable_plugin_nfacct}" != "no" -a "${have_libnetfilter_acct}" = "yes" -a "${have_libmnl}" = "yes"; then
390
enable_plugin_nfacct="yes"
391
+ AC_DEFINE([HAVE_LIBMNL], [1], [libmnl usability])
392
+ AC_DEFINE([HAVE_LIBNETFILTER_ACCT], [1], [libnetfilter_acct usability])
393
AC_DEFINE([INTERNAL_PLUGIN_NFACCT], [1], [nfacct plugin usability])
394
OPTIONAL_NFACCT_CLFAGS="${NFACCT_CFLAGS} ${LIBMNL_CFLAGS}"
395
OPTIONAL_NFACCT_LIBS="${NFACCT_LIBS} ${LIBMNL_LIBS}"