diff --git a/config.mk b/config.mk index 4962d28b..41c7af6a 100644 --- a/config.mk +++ b/config.mk @@ -241,11 +241,6 @@ ifeq ($(WITH_SRV),yes) CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_SRV endif -ifeq ($(WITH_WEBSOCKETS),yes) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WEBSOCKETS - BROKER_LIBS:=$(BROKER_LIBS) -lwebsockets -endif - ifeq ($(UNAME),SunOS) BROKER_LIBS:=$(BROKER_LIBS) -lsocket -lnsl LIB_LIBS:=$(LIB_LIBS) -lsocket -lnsl @@ -265,6 +260,16 @@ ifeq ($(WITH_DOCS),yes) MAKE_ALL:=$(MAKE_ALL) docs endif +ifeq ($(WITH_WEBSOCKETS),yes) + BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WEBSOCKETS + BROKER_LIBS:=$(BROKER_LIBS) -lwebsockets +endif + +ifeq ($(WITH_WEBSOCKETS),static) + BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WEBSOCKETS + BROKER_LIBS:=$(BROKER_LIBS) -static -lwebsockets +endif + INSTALL?=install prefix=/usr/local mandir=${prefix}/share/man diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 4ec5624e..08ceeb72 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -44,11 +44,12 @@ parts: mosquitto: plugin: make - make-parameters: ["prefix=/usr", "WITH_SRV=no"] + make-parameters: ["prefix=/usr", "WITH_SRV=no", "WITH_WEBSOCKETS=static"] source: https://github.com/eclipse/mosquitto source-type: git build-packages: + - libwebsockets-dev - libssl-dev - uuid-dev - xsltproc