mosquitto: don't depend on websocket for -nossl variant
authorNicolas Thill <nico@openwrt.org>
Sun, 22 Feb 2015 01:36:35 +0000 (02:36 +0100)
committerNicolas Thill <nico@openwrt.org>
Sun, 22 Feb 2015 01:36:35 +0000 (02:36 +0100)
Signed-off-by: Nicolas Thill <nico@openwrt.org>
net/mosquitto/Makefile

index 2fe7419516e5fd16d43d2b5dfdafd32e93a5d575..9bab9b570f813fbda0dedc6b5a9180da18b7dfd2 100644 (file)
@@ -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)))