cannelloni: make SCTP support optional

Since version 20160414 SCTP support is optional. Introduce an automatic
optional dependency for this protocol.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/cannelloni/Config.in b/package/cannelloni/Config.in
index 8f3e88830870bdf32167798d0291755f864e741d..e137e60c60775c4379ba86679f38c088a5aa5ad7 100644 (file)
--- a/package/cannelloni/Config.in
+++ b/package/cannelloni/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_CANNELLONI
        depends on BR2_USE_MMU # lksctp-tools
        depends on BR2_TOOLCHAIN_HAS_THREADS # lksctp-tools
        depends on !BR2_STATIC_LIBS # lksctp-tools
-       select BR2_PACKAGE_LKSCTP_TOOLS
        help
          A SocketCAN over Ethernet tunnel. The tunnel supports both
          UDP and SCTP protocols.

diff --git a/package/cannelloni/cannelloni.mk b/package/cannelloni/cannelloni.mk
index 680e09a006bb5793db360bb818240a76ef222666..fffdb4ba9ab0f394f036165b95ee14e88eef0cee 100644 (file)
--- a/package/cannelloni/cannelloni.mk
+++ b/package/cannelloni/cannelloni.mk
@@ -8,6 +8,12 @@ CANNELLONI_VERSION = 20160414
 CANNELLONI_SITE = $(call github,mguentner,cannelloni,$(CANNELLONI_VERSION))
 CANNELLONI_LICENSE = GPLv2
 CANNELLONI_LICENSE_FILES = gpl-2.0.txt
-CANNELLONI_DEPENDENCIES = lksctp-tools
+
+ifeq ($(BR2_PACKAGE_LKSCTP_TOOLS),y)
+CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=ON
+CANNELLONI_DEPENDENCIES += lksctp-tools
+else
+CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=OFF
+endif
 
 $(eval $(cmake-package))