Make it easier to build without bundled uthash.h.
Use "make WITH_BUNDLED_DEPS=no".
This commit is contained in:
parent
e6a0199bb2
commit
dceb02f444
@ -5,6 +5,9 @@ Broker:
|
|||||||
- Fix build when using WITH_ADNS=yes.
|
- Fix build when using WITH_ADNS=yes.
|
||||||
- Fix incorrect call to setsockopt() for TCP_NODELAY. Closes #941.
|
- Fix incorrect call to setsockopt() for TCP_NODELAY. Closes #941.
|
||||||
|
|
||||||
|
Build:
|
||||||
|
- Make it easier to build with bundled uthash.h using "WITH_BUNDLED_DEPS=no".
|
||||||
|
|
||||||
|
|
||||||
1.5.1 - 20180816
|
1.5.1 - 20180816
|
||||||
================
|
================
|
||||||
|
@ -92,6 +92,9 @@ WITH_STATIC_LIBRARIES:=no
|
|||||||
# Build with epoll support.
|
# Build with epoll support.
|
||||||
WITH_EPOLL:=yes
|
WITH_EPOLL:=yes
|
||||||
|
|
||||||
|
# Build with bundled uthash.h
|
||||||
|
WITH_BUNDLED_DEPS:=yes
|
||||||
|
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
# End of user configuration
|
# End of user configuration
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
@ -287,3 +290,6 @@ ifeq ($(WITH_EPOLL),yes)
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_BUNDLED_DEPS),yes)
|
||||||
|
BROKER_CFLAGS:=$(BROKER_CFLAGS) -Ideps
|
||||||
|
endif
|
||||||
|
@ -51,6 +51,11 @@ set (MOSQ_SRCS
|
|||||||
../lib/will_mosq.c ../lib/will_mosq.h)
|
../lib/will_mosq.c ../lib/will_mosq.h)
|
||||||
|
|
||||||
|
|
||||||
|
option(WITH_BUNDLED_DEPS "Build with bundled dependencies?" ON)
|
||||||
|
if (${WITH_BUNDLED_DEPS} STREQUAL ON)
|
||||||
|
include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src/deps)
|
||||||
|
endif (${WITH_BUNDLED_DEPS} STREQUAL ON)
|
||||||
|
|
||||||
option(INC_BRIDGE_SUPPORT
|
option(INC_BRIDGE_SUPPORT
|
||||||
"Include bridge support for connecting to other brokers?" ON)
|
"Include bridge support for connecting to other brokers?" ON)
|
||||||
if (${INC_BRIDGE_SUPPORT} STREQUAL ON)
|
if (${INC_BRIDGE_SUPPORT} STREQUAL ON)
|
||||||
|
Loading…
Reference in New Issue
Block a user