aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-03 16:14:14 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-03 16:14:14 +0000
commitd4ec4c4c3a9e788c04513298ae06efa0d9ebbfce (patch)
tree29c91d891c8a34d1f8d9c00a25db68301ed02e6f /main
parent05e481bb17d9ebf457dbd049f6804d49a95e7d2a (diff)
Merge in changes that allow Asterisk to be built against the Hoard
memory allocator. See doc/hoard.txt for more details. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@135405 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/main/Makefile b/main/Makefile
index ddecb0b37..a985819de 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -104,6 +104,12 @@ ifeq ($(OSARCH),SunOS)
ASTLINK=
endif
+ifneq ($(findstring USE_HOARD_ALLOCATOR,$(MENUSELECT_CFLAGS)),)
+ ifneq ($(HOARD_LIB),)
+ AST_LIBS+=$(HOARD_LIB)
+ endif
+endif
+
CHECK_SUBDIR: # do nothing, just make sure that we recurse in the subdir/
editline/libedit.a: CHECK_SUBDIR