From ef8cf93e817364e0ddab2bf89d5ddb4f8e0fd6fe Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Fri, 7 Apr 2006 22:22:18 +0000 Subject: Moved the SMARTHEAP macro setting from slapd local Makefile to global nsconfig.mk so that the makefile used for packaging gets the info. --- ldap/servers/slapd/Makefile | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'ldap/servers/slapd/Makefile') diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile index 71e1788a..8fce51f5 100644 --- a/ldap/servers/slapd/Makefile +++ b/ldap/servers/slapd/Makefile @@ -77,33 +77,6 @@ CFLAGS+=-DQUANTIFYING LDAP_DONT_USE_SMARTHEAP=1 endif -# It looks like most of the latest versions of Unix that we ship on -# have a good enough heap implementations that they don't need -# SmartHeap. We still need it on NT and HPUX. -# Solaris 8 and later has mtmalloc -# By contract HPUX must be aligned with Solaris. -ifneq ($(ARCH), SOLARIS) -ifneq ($(ARCH), WINNT) -ifneq ($(ARCH), HPUX) -LDAP_DONT_USE_SMARTHEAP=1 -endif -endif -endif - -ifeq ($(ARCH), HPUX) - ifeq ($(NSOS_TEST1),ia64) - LDAP_DONT_USE_SMARTHEAP=1 - ifeq ($(DEBUG), optimize) - CFLAGS+=+O3 - endif - endif -endif - -# Don't use smartheap for debug builds -ifeq ($(DEBUG), full) -LDAP_DONT_USE_SMARTHEAP=1 -endif - ifndef LDAP_DONT_USE_SMARTHEAP include $(BUILD_ROOT)/ns_usesh.mk INCLUDES+=-I$(SH_INCLUDE) -- cgit