Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27814/ldap/servers/slapd
Modified Files:
Makefile
Log Message:
Moved the SMARTHEAP macro setting from slapd local Makefile to global nsconfig.mk so that
the makefile used for packaging gets the info.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile 7 Apr 2006 01:33:37 -0000 1.12
+++ Makefile 7 Apr 2006 22:22:18 -0000 1.13
@@ -77,33 +77,6 @@
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)
Show replies by date