mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-23 04:42:28 +00:00
BUILD: opentracing: fixed build when using pkg-config utility
In case the OpenTracing C Wrapper library was installed as part of the system (ie in a directory that pkg-config considers part of the system), HAProxy building was not possible because in that case pkg-config did not set the value of the OT_CFLAGS variable in the addon Makefile. This resolves GitHub issue #1323.
This commit is contained in:
parent
99198546f6
commit
3571111de3
@ -8,6 +8,7 @@ OT_DEFINE =
|
||||
OT_CFLAGS =
|
||||
OT_LDFLAGS =
|
||||
OT_DEBUG_EXT =
|
||||
OT_PKGSTAT =
|
||||
OTC_WRAPPER = opentracing-c-wrapper
|
||||
|
||||
ifneq ($(OT_DEBUG),)
|
||||
@ -16,6 +17,7 @@ OT_DEFINE = -DDEBUG_OT
|
||||
endif
|
||||
|
||||
ifeq ($(OT_INC),)
|
||||
OT_PKGSTAT = $(shell pkg-config --exists $(OTC_WRAPPER)$(OT_DEBUG_EXT); echo $$?)
|
||||
OT_CFLAGS = $(shell pkg-config --silence-errors --cflags $(OTC_WRAPPER)$(OT_DEBUG_EXT))
|
||||
else
|
||||
ifneq ($(wildcard $(OT_INC)/$(OTC_WRAPPER)/.*),)
|
||||
@ -23,9 +25,15 @@ OT_CFLAGS = -I$(OT_INC) $(if $(OT_DEBUG),-DOTC_DBG_MEM)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OT_PKGSTAT),)
|
||||
ifeq ($(OT_CFLAGS),)
|
||||
$(error OpenTracing C wrapper : can't find headers)
|
||||
endif
|
||||
else
|
||||
ifneq ($(OT_PKGSTAT),0)
|
||||
$(error OpenTracing C wrapper : can't find package)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OT_LIB),)
|
||||
OT_LDFLAGS = $(shell pkg-config --silence-errors --libs $(OTC_WRAPPER)$(OT_DEBUG_EXT))
|
||||
|
Loading…
Reference in New Issue
Block a user