From b376f0163e7171162f077d8c722751d496a34e6c Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Thu, 20 Nov 2008 14:47:04 +0100 Subject: [PATCH] [BUILD] Fixed Makefile for linking pcre If both make parameters USE_PCRE and USE_STATIC_PCRE are set to 1 while building haproxy, pcre gets linked in dynamically. Therefore we check if USE_STATIC_PCRE was explicitely enabled to ommit the CFLAGS and LDFLAGS normally set if USE_PCRE is enabled. (cherry picked from commit c820300adf36700cbbff15249a8629baa63c5f5a) --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index eb72de68e..1d22eba21 100644 --- a/Makefile +++ b/Makefile @@ -387,8 +387,10 @@ ifneq ($(USE_PCRE),) ifeq ($(PCREDIR),) PCREDIR := $(shell pcre-config --prefix 2>/dev/null || echo /usr/local) endif +ifeq ($(USE_STATIC_PCRE),) OPTIONS_CFLAGS += -DUSE_PCRE -I$(PCREDIR)/include OPTIONS_LDFLAGS += -L$(PCREDIR)/lib -lpcreposix -lpcre +endif BUILD_OPTIONS += $(call ignore_implicit,USE_PCRE) endif -- 2.47.3