mirror of
http://git.haproxy.org/git/haproxy.git
synced 2026-02-04 13:23:10 +02:00
BUILD/MEDIUM: deviceatlas: updating the addon part.
- Reflecing the changes done in addons/deviceatlas/Makefile.inc. Enabling the cache feature and its disabling option as well. - Now the `dadwsch` application is part of the API's package for more general purposes, we remove it. - Minor and transparent to user changes into da.c's workflow, also making more noticeable some notices with appropriate logging levels. - Adding support for the new `deviceatlas-cache-size` config keyword, a no-op when the cache support is disabled. - Adding missing compilation units and relevant api updates to the dummy library version.
This commit is contained in:
committed by
Willy Tarreau
parent
f960cde786
commit
5c196f0d8d
23
Makefile
23
Makefile
@@ -667,28 +667,13 @@ endif
|
||||
|
||||
ifneq ($(USE_DEVICEATLAS),)
|
||||
# Use DEVICEATLAS_SRC and possibly DEVICEATLAS_INC and DEVICEATLAS_LIB to force path
|
||||
# to DeviceAtlas headers and libraries if needed.
|
||||
# to DeviceAtlas headers and libraries if needed. In this context, DEVICEATLAS_NOCACHE
|
||||
# can be used to disable the cache support if needed (this also removes the necessity of having
|
||||
# a C++ toolchain installed).
|
||||
DEVICEATLAS_INC = $(DEVICEATLAS_SRC)
|
||||
DEVICEATLAS_LIB = $(DEVICEATLAS_SRC)
|
||||
ifeq ($(DEVICEATLAS_SRC),)
|
||||
DEVICEATLAS_LDFLAGS += -lda
|
||||
else
|
||||
ifeq ($(USE_PCRE),)
|
||||
ifeq ($(USE_PCRE2),)
|
||||
$(error the DeviceAtlas module needs the PCRE or the PCRE2 library in order to compile)
|
||||
endif
|
||||
endif
|
||||
ifneq ($(USE_PCRE2),)
|
||||
DEVICEATLAS_CFLAGS += -DDA_REGEX_HDR=\"dac_pcre2.c\" -DDA_REGEX_TAG=2
|
||||
endif
|
||||
OPTIONS_OBJS += $(DEVICEATLAS_LIB)/Os/daunix.o
|
||||
OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dadwcom.o
|
||||
OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dasch.o
|
||||
OPTIONS_OBJS += $(DEVICEATLAS_LIB)/json.o
|
||||
OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dac.o
|
||||
endif
|
||||
include addons/deviceatlas/Makefile.inc
|
||||
OPTIONS_OBJS += addons/deviceatlas/da.o
|
||||
DEVICEATLAS_CFLAGS += $(if $(DEVICEATLAS_INC),-I$(DEVICEATLAS_INC)) $(if $(DEVICEATLAS_SRC),-DDATLAS_DA_NOCACHE)
|
||||
endif
|
||||
|
||||
# Use 51DEGREES_SRC and possibly 51DEGREES_INC and 51DEGREES_LIB to force path
|
||||
|
||||
Reference in New Issue
Block a user