daq: libdnet is optional not mandatory

libdnet is an optional dependency, it is only needed if nfq or ipq
module are enabled.

So, if libdnet and libnetfilter_queue are available, enable nfq module
and add a dependency to both packages otherwise disable nfq module.

Moreover, always disable ipq module as libipq is deprecated, it isn't
enable in iptables. Even if it was enabled, libipq.h can't be included
as it makes a reference to linux/netfilter_ipv4/ip_queue.h which is not
available anymore

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/daq/Config.in b/package/daq/Config.in
index 1d24c6d11a930237f69da1b661b8d0d4b4b7c5ea..ad294abd60296d0adbaab8afc52b1328093e788b 100644 (file)
--- a/package/daq/Config.in
+++ b/package/daq/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_DAQ
        bool "daq"
        depends on !BR2_STATIC_LIBS # dlfcn.h
-       select BR2_PACKAGE_LIBDNET
        help
          DAQ is a Data Acquisition library for packet I/O from the
          Snort project.

diff --git a/package/daq/daq.mk b/package/daq/daq.mk
index 4499fb4b68eaa0d38620c7ac74f580561a96c451..33c8a1f662e0f167199b40da8a302599a7238639 100644 (file)
--- a/package/daq/daq.mk
+++ b/package/daq/daq.mk
@@ -10,12 +10,21 @@ DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz
 DAQ_LICENSE = GPL-2.0
 DAQ_LICENSE_FILES = COPYING
 DAQ_INSTALL_STAGING = YES
-DAQ_DEPENDENCIES = libdnet
 
 # package does not build in parallel due to improper make rules
 # related to the generation of the tokdefs.h header file
 DAQ_MAKE = $(MAKE1)
 
+# disable ipq module as libipq is deprecated
+DAQ_CONF_OPTS += --disable-ipq-module
+
+ifeq ($(BR2_PACKAGE_LIBDNET)$(BR2_PACKAGE_LIBNETFILTER_QUEUE),yy)
+DAQ_DEPENDENCIES += libdnet libnetfilter_queue
+DAQ_CONF_OPTS += --enable-nfq-module
+else
+DAQ_CONF_OPTS += --disable-nfq-module
+endif
+
 ifeq ($(BR2_PACKAGE_LIBPCAP),y)
 DAQ_DEPENDENCIES += libpcap
 # assume these flags are available to prevent configure from running