From: Abe Timmerman <abe@ztreet.demon.nl>
Date: Sat, 27 Jan 2007 17:26:47 +0000 (+0100)
Subject: [perl@30030] blead on OpenVMS doesn't build
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e9df20f7af2f1531d22810bdb9d6c06f46210beb;p=p5sagit%2Fp5-mst-13.2.git

[perl@30030] blead on OpenVMS doesn't build
Message-Id: <200701271726.48347.abe@ztreet.demon.nl>

Disable DECterm support by default, and when we enable it,
make sure the image we need is installed, not merely present.

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

diff --git a/configure.com b/configure.com
index 72f0707..1e3362c 100644
--- a/configure.com
+++ b/configure.com
@@ -51,7 +51,7 @@ $ use64bitall = "n"
 $ use64bitint = "n"
 $ uselargefiles = "n"
 $ usestdstat = "n"
-$ usedecterm = "y"
+$ usedecterm = "n"
 $ usesitecustomize = "n"
 $ C_Compiler_Replace = "CC="
 $ thread_upcalls = "MTU="
@@ -2557,11 +2557,31 @@ $     d_unlink_all_versions = "define"
 $ ELSE
 $     d_unlink_all_versions = "undef"
 $ ENDIF
-$ bool_dflt = "y"
-$ IF F$TYPE(usedecterm) .NES. "" 
+$!
+$! To avoid 'SYSTEM-F-PROTINSTALL, protected images must be installed'
+$! at run time, we must check that the DECterm image is both present
+$! and installed as a known image.
+$!
+$ decterm_capable = "FALSE"
+$ dflt = "SYS$SHARE:DECW$TERMINALSHR12.EXE"
+$ IF F$SEARCH(dflt) .NES. "" 
+$ THEN 
+$    decterm_capable = F$FILE_ATTRIBUTES(dflt, "KNOWN")
+$ ELSE
+$     dflt = "SYS$SHARE:DECW$TERMINALSHR.EXE"
+$     IF F$SEARCH(dflt) .NES. "" THEN decterm_capable = F$FILE_ATTRIBUTES(dflt, "KNOWN")
+$ ENDIF
+$!
+$ IF F$TYPE(usedecterm) .NES. ""
 $ THEN
-$       dflt = f$search("SYS$SHARE:DECW$TERMINALSHR*.EXE")
-$       IF dflt .EQS. "" THEN bool_dflt = "n"
+$       if usedecterm .or. usedecterm .eqs. "define"
+$       then
+$         bool_dflt="y"
+$       else
+$         bool_dflt="n"
+$       endif
+$ ELSE
+$       bool_dflt="n"
 $ ENDIF
 $ IF .NOT. use_debugging_perl THEN bool_dflt = "n"
 $ echo ""
@@ -2571,6 +2591,11 @@ $ echo "If this does not make any sense to you, just accept the default '" + boo
 $ rp = "Build with DECterm Perl debugger support, if available? [''bool_dflt'] "
 $ GOSUB myread
 $ usedecterm=ans
+$ IF (usedecterm .OR. usedecterm .EQS. "define") .AND. .NOT. decterm_capable
+$ THEN
+$     echo4 "No installed DECterm image found, disabling..."
+$     usedecterm = "n"
+$ ENDIF
 $! CC Flags
 $ echo ""
 $ echo "Your compiler may want other flags.  For this question you should include"