Eliminate macro for OpenVMS debugger [perl #118447].

We need to do whatever the configuration says we are doing via
$Config{dbgprefix} and/or $Config{usevmsdebug} for extension
building to work, so it makes sense for the top-level build to
also base what it is doing on the configuration choice rather
than on the special invocation of MMK with /MACRO=__DEBUG__=1.

So this patch makes the top-level build do what we've configured
to do and eliminates the instruction to use the macro.

diff --git a/configure.com b/configure.com
index f1c6171..635a95a 100644 (file)
--- a/configure.com
+++ b/configure.com
@@ -1980,7 +1980,6 @@ $ use_vmsdebug_perl = ans
 $ IF use_vmsdebug_perl
 $ THEN
 $   usevmsdebug = "define"
-$   macros = macros + """__DEBUG__=1"","
 $ ELSE
 $   usevmsdebug = "undef"
 $ ENDIF
@@ -7029,6 +7028,12 @@ $   ENDIF
 $ ELSE
 $   LARGEFILE_REPLACE = "LARGEFILE="
 $ ENDIF
+$ IF use_vmsdebug_perl
+$ THEN
+$   DEBUG_REPLACE = "USEVMSDEBUG=__DEBUG__=1"
+$ ELSE
+$   DEBUG_REPLACE = "USEVMSDEBUG="
+$ ENDIF
 $!
 $! In order not to stress the tiny command buffer on pre-7.3-2 systems,
 $! we put the following substitutions in a file and pass the file to
@@ -7050,6 +7055,7 @@ $ WC "PV=''version'"
 $ WC "FLAGS=FLAGS=''extra_flags'"
 $ WC "''LARGEFILE_REPLACE'"
 $ WC "ARCHNAME=ARCHNAME=''archname'"
+$ WC "''DEBUG_REPLACE'"
 $ close CONFIG
 $!
 $ echo4 "Extracting ''defmakefile' (with variable substitutions)"

diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index 7ccc84b..16773aa 100644 (file)
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -34,6 +34,7 @@
 ~FLAGS~
 ~LARGEFILE~
 ~ARCHNAME~
+~USEVMSDEBUG~
 
 #: >>>>> Architecture-specific options <<<<<
 .ifdef IXE