From: Willy Tarreau <w@1wt.eu>
Date: Tue, 19 Feb 2008 09:53:32 +0000 (+0100)
Subject: [BUILD] ensure that makefile understands USE_DLMALLOC=1
X-Git-Tag: v1.3.15~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f14358bd1ad4f7c9fd32c3900ac3a2848bed1b9a;p=thirdparty%2Fhaproxy.git

[BUILD] ensure that makefile understands USE_DLMALLOC=1

USE_DLMALLOC=1 was ignored since last makefile update. It's better
to keep it running for existing setups.
---

diff --git a/Makefile b/Makefile
index 43c05fd8ba..4f3a723fee 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@
 # Valid USE_* options are the following. Most of them are automatically set by
 # the TARGET, others have to be explictly specified :
 #   USE_CTTPROXY         : enable CTTPROXY on Linux (needs kernel patch).
+#   USE_DLMALLOC         : enable use of dlmalloc (see DLMALLOC_SRC)
 #   USE_EPOLL            : enable epoll() on Linux 2.6. Automatic.
 #   USE_EPOLL_WORKAROUND : enable epoll() bug workaround. Automatic.
 #   USE_GETSOCKNAME      : enable getsockname() on Linux 2.2. Automatic.
@@ -346,6 +347,13 @@ OPTIONS_CFLAGS += -DCONFIG_HAP_USE_REGPARM
 BUILD_OPTIONS  += $(call ignore_implicit,USE_REGPARM)
 endif
 
+ifneq ($(USE_DLMALLOC),)
+BUILD_OPTIONS  += $(call ignore_implicit,USE_DLMALLOC)
+ifeq ($(DLMALLOC_SRC),)
+DLMALLOC_SRC=src/dlmalloc.c
+endif
+endif
+
 ifneq ($(DLMALLOC_SRC),)
 # May be changed to match PAGE_SIZE on every platform
 DLMALLOC_THRES = 4096