From: Steve Hay <SteveHay@planit.com>
Date: Fri, 7 Jan 2005 17:25:35 +0000 (+0000)
Subject: Disable PERL_MALLOC and DEBUG_MSTATS in win32/makefile.mk by default
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c800dd8b9ba671358c30dfe5fbe83d3b44273fab;p=p5sagit%2Fp5-mst-13.2.git

Disable PERL_MALLOC and DEBUG_MSTATS in win32/makefile.mk by default
and force PERL_MALLOC off if USE_IMP_SYS is on

This brings makefile.mk into line with Makefile in this regard

(PERL_MALLOC cannot currently be used with USE_IMP_SYS, e.g. see:
http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2004-07/msg00465.html
so it is sensible to enforce this, and to not have the default set
to a configuration that isn't allowed)

p4raw-id: //depot/perl@23769
---

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 1a2625a..45ed15e 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -155,14 +155,14 @@ CRYPT_SRC	*= fcrypt.c
 # extensions if you change the default.  Currently, this cannot be enabled
 # if you ask for USE_IMP_SYS above.
 #
-PERL_MALLOC	*= define
+#PERL_MALLOC	*= define
 
 #
 # set this to enable debugging mstats
 # This must be enabled to use the Devel::Peek::mstat() function.  This cannot
 # be enabled without PERL_MALLOC as well.
 #
-DEBUG_MSTATS  = define
+#DEBUG_MSTATS  = define
 
 #
 # set the install locations of the compiler include/libraries
@@ -259,6 +259,10 @@ DEBUG_MSTATS   = undef
 BUILDOPT       += -DPERL_DEBUGGING_MSTATS
 .ENDIF
 
+.IF "$(USE_IMP_SYS)" == "define"
+PERL_MALLOC	= undef
+.ENDIF
+
 .IF "$(USE_IMP_SYS)$(USE_MULTI)" == "defineundef"
 USE_MULTI	!= define
 .ENDIF