remove mqtt-c from websockets (#14181)
* remove MQTT-C (MQTT 3 implementation) from buildsystem
Timotej S committed
Jan 23, 2023 at 19:59 UTC
c2c3876c519fbc22a60a5d8b753dc6d8e81e0fed
5 files changed
+3
-8
CMakeLists.txt
-3
@@ -944,8 +944,6 @@ set(MQTT_WEBSOCKETS_FILES
944
mqtt_websockets/c-rbuf/src/ringbuffer.c
945
mqtt_websockets/c-rbuf/include/ringbuffer.h
946
mqtt_websockets/c-rbuf/src/ringbuffer_internal.h
947
- mqtt_websockets/MQTT-C/src/mqtt.c
948
- mqtt_websockets/MQTT-C/include/mqtt.h
947
)
948
949
set(SPAWN_PLUGIN_FILES
@@ -1273,7 +1271,6 @@ list(APPEND NETDATA_COMMON_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS})
1271
list(APPEND NETDATA_COMMON_CFLAGS ${PROTOBUF_CFLAGS_OTHER})
1272
list(APPEND NETDATA_FILES ${ACLK_FILES} ${ACLK_PROTO_BUILT_SRCS} ${ACLK_PROTO_BUILT_HDRS})
1273
include_directories(BEFORE ${CMAKE_SOURCE_DIR}/aclk/aclk-schemas)
1276
-include_directories(BEFORE ${CMAKE_SOURCE_DIR}/mqtt_websockets/MQTT-C/include)
1274
include_directories(BEFORE ${CMAKE_SOURCE_DIR}/mqtt_websockets/src/include)
1275
include_directories(BEFORE ${CMAKE_SOURCE_DIR}/mqtt_websockets/c-rbuf/include)
1276
Makefile.am
-2
@@ -736,8 +736,6 @@ libmqttwebsockets_a_SOURCES = \
736
mqtt_websockets/c-rbuf/src/ringbuffer.c \
737
mqtt_websockets/c-rbuf/include/ringbuffer.h \
738
mqtt_websockets/c-rbuf/src/ringbuffer_internal.h \
739
- mqtt_websockets/MQTT-C/src/mqtt.c \
740
- mqtt_websockets/MQTT-C/include/mqtt.h \
739
mqtt_websockets/c_rhash/src/c_rhash.c \
740
mqtt_websockets/c_rhash/include/c_rhash.h \
741
mqtt_websockets/c_rhash/src/c_rhash_internal.h
aclk/aclk.c
+1
-1
@@ -701,7 +701,7 @@ void *aclk_main(void *ptr)
701
if (wait_till_agent_claim_ready())
702
goto exit;
703
704
- if (!(mqttwss_client = mqtt_wss_new("mqtt_wss", aclk_mqtt_wss_log_cb, msg_callback, puback_callback, 1))) {
704
+ if (!(mqttwss_client = mqtt_wss_new("mqtt_wss", aclk_mqtt_wss_log_cb, msg_callback, puback_callback))) {
705
error("Couldn't initialize MQTT_WSS network library");
706
goto exit;
707
}
configure.ac
+1
-1
@@ -813,7 +813,7 @@ if test "$enable_cloud" != "no"; then
813
if test "$can_enable_ng" = "yes"; then
814
enable_aclk="yes"
815
AC_DEFINE([ENABLE_ACLK], [1], [netdata ACLK])
816
- OPTIONAL_ACLK_CFLAGS="-I \$(abs_top_srcdir)/mqtt_websockets/src/include -I \$(abs_top_srcdir)/mqtt_websockets/c-rbuf/include -I \$(abs_top_srcdir)/mqtt_websockets/MQTT-C/include -I \$(abs_top_srcdir)/aclk/aclk-schemas"
816
+ OPTIONAL_ACLK_CFLAGS="-I \$(abs_top_srcdir)/mqtt_websockets/src/include -I \$(abs_top_srcdir)/mqtt_websockets/c-rbuf/include -I \$(abs_top_srcdir)/aclk/aclk-schemas"
817
OPTIONAL_PROTOBUF_CFLAGS="${PROTOBUF_CFLAGS}"
818
CXX11FLAG="-std=c++11"
819
OPTIONAL_PROTOBUF_LIBS="${PROTOBUF_LIBS}"
mqtt_websockets
+1
-1
@@ -1 +1 @@
1
-Subproject commit ee2eca38eb34609a8fabe99108e4c53cd0da7869
1
+Subproject commit 684fa17afb14ef5a46dde18802548615fdd441ac