janus-gateway: add websockets to transport section

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
[Thomas: propagate BR2_USE_MMU dependency.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in
index 7e170fd4c0eadc1afb1333fc9b3d9e21f8c172e5..9af4d566375113ee7074d3cba965edc3d44b4f79 100644 (file)
--- a/package/janus-gateway/Config.in
+++ b/package/janus-gateway/Config.in
@@ -64,6 +64,11 @@ config BR2_PACKAGE_JANUS_REST
 comment "REST transport needs a toolchain w/ threads"
        depends on !BR2_TOOLCHAIN_HAS_THREADS
 
+config BR2_PACKAGE_JANUS_WEBSOCKETS
+       bool "WebSockets"
+       depends on BR2_USE_MMU
+       select BR2_PACKAGE_LIBWEBSOCKETS
+
 endif
 
 comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"

diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
index 01021f84f5e2b69c3ac08baf8a5e9b910364e199..69282a20ca663f10e44d092ccbb2c5969fc59b6e 100644 (file)
--- a/package/janus-gateway/janus-gateway.mk
+++ b/package/janus-gateway/janus-gateway.mk
@@ -84,13 +84,6 @@ else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail
 endif
 
-ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y)
-JANUS_GATEWAY_DEPENDENCIES += libwebsockets
-JANUS_GATEWAY_CONF_OPTS += --enable-websockets
-else
-JANUS_GATEWAY_CONF_OPTS += --disable-websockets
-endif
-
 ifeq ($(BR2_PACKAGE_JANUS_REST),y)
 JANUS_GATEWAY_DEPENDENCIES += libmicrohttpd
 JANUS_GATEWAY_CONF_OPTS += --enable-rest
@@ -98,6 +91,13 @@ else
 JANUS_GATEWAY_CONF_OPTS += --disable-rest
 endif
 
+ifeq ($(BR2_PACKAGE_JANUS_WEBSOCKETS),y)
+JANUS_GATEWAY_DEPENDENCIES += libwebsockets
+JANUS_GATEWAY_CONF_OPTS += --enable-websockets
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-websockets
+endif
+
 # Parallel build broken
 JANUS_GATEWAY_MAKE = $(MAKE1)