lede-packages-rs

commit cd21cbb82eacf5c2dc60a8dd8dfa51f978b98193
parent c36bc9cee05ad01ea6b51b4976b61ce2f154e056
Author: Nicolas Thill <nico@openwrt.org>
Date:   Sun, 22 Feb 2015 02:36:35 +0100

mosquitto: don't depend on websocket for -nossl variant

Signed-off-by: Nicolas Thill <nico@openwrt.org>

Diffstat:
M
net/mosquitto/Makefile
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
@@ -21,9 +21,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
 
 include $(INCLUDE_DIR)/package.mk
 
-MAKE_FLAGS+=WITH_DOCS=no
-MAKE_FLAGS+=WITH_WEBSOCKETS=$(if $(CONFIG_MOSQUITTO_LWS),"yes","no")
-
 define Package/$(PKG_NAME)/default
   SECTION:=net
   CATEGORY:=Network
@@ -186,8 +183,11 @@ endef
 Package/libmosquitto-nossl/install = $(Package/libmosquitto/install)
 
 # Applies to all...
+MAKE_FLAGS += WITH_DOCS=no
 ifeq ($(BUILD_VARIANT),nossl)
-        MAKE_FLAGS += WITH_TLS=no
+        MAKE_FLAGS += WITH_TLS=no WITH_WEBSOCKETS=no
+else
+	MAKE_FLAGS += WITH_WEBSOCKETS=$(if $(CONFIG_MOSQUITTO_LWS),"yes","no")
 endif
 
 $(eval $(call BuildPackage,$(PKG_NAME)))