From: Steve Hay <SteveHay@planit.com>
Date: Tue, 15 Feb 2005 13:20:40 +0000 (+0000)
Subject: Fix PERL_MALLOC/DEBUG_MSTATS options in Win32 makefiles
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=646e33b6c26a24d89e6543ab606cb6a803ed6126;p=p5sagit%2Fp5-mst-13.2.git

Fix PERL_MALLOC/DEBUG_MSTATS options in Win32 makefiles

Currently, if USE_IMP_SYS is defined then PERL_MALLOC gets undefined.
We should also undefine DEBUG_MSTATS if PERL_MALLOC is (or has become)
undefined, and we should do all this *before* inspecting DEBUG_MSTATS
to see if we need to add -DPERL_DEBUGGING_MSTATS to BUILDOPT.

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

diff --git a/win32/Makefile b/win32/Makefile
index eb43c0f..dbebf61 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -206,21 +206,22 @@ D_CRYPT		= define
 CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 !ENDIF
 
+!IF "$(USE_IMP_SYS)" == "define"
+PERL_MALLOC	= undef
+DEBUG_MSTATS	= undef
+!ENDIF
+
 !IF "$(PERL_MALLOC)" == ""
 PERL_MALLOC	= undef
-DEBUG_MSTATS   = undef
+DEBUG_MSTATS	= undef
 !ENDIF
 
 !IF "$(DEBUG_MSTATS)" == ""
-DEBUG_MSTATS   = undef
+DEBUG_MSTATS	= undef
 !ENDIF
 
 !IF "$(DEBUG_MSTATS)" == "define"
-BUILDOPT       = $(BUILDOPT) -DPERL_DEBUGGING_MSTATS
-!ENDIF
-
-!IF "$(USE_IMP_SYS)" == "define"
-PERL_MALLOC	= undef
+BUILDOPT	= $(BUILDOPT) -DPERL_DEBUGGING_MSTATS
 !ENDIF
 
 !IF "$(USE_MULTI)" == ""
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 44f1371..b8add53 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -162,7 +162,7 @@ CRYPT_SRC	*= fcrypt.c
 # 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
@@ -238,6 +238,7 @@ CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 .ENDIF
 
 PERL_MALLOC	*= undef
+DEBUG_MSTATS	*= undef
 
 USE_MULTI	*= undef
 USE_ITHREADS	*= undef
@@ -246,21 +247,16 @@ USE_PERLIO	*= undef
 USE_LARGE_FILES	*= undef
 USE_PERLCRT	*= undef
 
-.IF "$(PERL_MALLOC)" == "undef"
+.IF "$(USE_IMP_SYS)" == "define"
 PERL_MALLOC	= undef
-DEBUG_MSTATS   = undef
 .ENDIF
 
-.IF "$(DEBUG_MSTATS)" == "undef"
-DEBUG_MSTATS   = undef
+.IF "$(PERL_MALLOC)" == "undef"
+DEBUG_MSTATS	= undef
 .ENDIF
 
 .IF "$(DEBUG_MSTATS)" == "define"
-BUILDOPT       += -DPERL_DEBUGGING_MSTATS
-.ENDIF
-
-.IF "$(USE_IMP_SYS)" == "define"
-PERL_MALLOC	= undef
+BUILDOPT	+= -DPERL_DEBUGGING_MSTATS
 .ENDIF
 
 .IF "$(USE_IMP_SYS)$(USE_MULTI)" == "defineundef"