From: Willy Tarreau <w@1wt.eu>
Date: Fri, 7 Mar 2008 09:02:14 +0000 (+0100)
Subject: [CLEANUP] report dlmalloc's source path only if explictly specified
X-Git-Tag: v1.3.15~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32d19a3957be4f3b275a72105fb53b39219999e;p=thirdparty%2Fhaproxy.git

[CLEANUP] report dlmalloc's source path only if explictly specified

There's no point in reporting dlmalloc's source path if it was the
default one.
---

diff --git a/Makefile b/Makefile
index 4f3a723fee..5e9b11d9e4 100644
--- a/Makefile
+++ b/Makefile
@@ -347,6 +347,11 @@ OPTIONS_CFLAGS += -DCONFIG_HAP_USE_REGPARM
 BUILD_OPTIONS  += $(call ignore_implicit,USE_REGPARM)
 endif
 
+# report DLMALLOC_SRC only if explicitly specified
+ifneq ($(DLMALLOC_SRC),)
+BUILD_OPTIONS += DLMALLOC_SRC=$(DLMALLOC_SRC)
+endif
+
 ifneq ($(USE_DLMALLOC),)
 BUILD_OPTIONS  += $(call ignore_implicit,USE_DLMALLOC)
 ifeq ($(DLMALLOC_SRC),)
@@ -355,10 +360,9 @@ endif
 endif
 
 ifneq ($(DLMALLOC_SRC),)
-# May be changed to match PAGE_SIZE on every platform
+# DLMALLOC_THRES may be changed to match PAGE_SIZE on every platform
 DLMALLOC_THRES = 4096
 OPTIONS_OBJS  += src/dlmalloc.o
-BUILD_OPTIONS += DLMALLOC_SRC=$(DLMALLOC_SRC)
 endif
 
 ifneq ($(USE_PCRE),)