Easier TCP stack selection for VMS

Here's a patch for [.vms]descrip.mms to make it a touch easier to use UCX
sockets instead of socketshr ones. (Use /Macro= DECC_SOCKETS=1 or
SOCKETSHR_SOCKETS=1 to select the stack)

It also skips the ?2P programs when compiling with __DEBUG__ support, as MMK
gets real unhappy up if you try. This is an evil hack, though, as the real
answer is to fix things so they work either way.

Hopefully Eudora hasn't word wrapped this...

p5p-msgid: 3.0.1.32.19970624151939.00994490@stargate.lbcc.cc.or.us

diff --git a/vms/descrip.mms b/vms/descrip.mms
index 15a297b..6c65317 100644 (file)
--- a/vms/descrip.mms
+++ b/vms/descrip.mms
@@ -24,7 +24,10 @@
 #: To each of the above, add /Macro="__AXP__=1" if building on an AXP,
 #:                           /Macro="__DEBUG__=1" to build a debug version
 #:                           (i.e. VMS debugger, not perl -D), and
-#:                           /Macro="SOCKET=1" to include socket support.
+#:                           /Macro="SOCKETSHR_SOCKETS=1" to include
+#:                           SOCKETSHR socket support.
+#:                           /Macro="DECC_SOCKETS=1" to include UCX (or
+#:                           compatible) socket support
 #
 #      tidy      -- purge files generated by executing this file
 #      clean     -- remove all intermediate (e.g. object files, C files generated
@@ -67,6 +70,25 @@ OBJVAL = $(MMS$TARGET_NAME)$(O)
 # Updated by fndvers.com -- do not edit by hand
 PERL_VERSION = 5_004  #
 
+.ifdef DECC_SOCKETS
+SOCKET=1
+.endif
+
+.ifdef SOCKETSHR_SOCKETS
+SOCKET=1
+.endif
+
+# If they defined SOCKET but didn't choose a stack, default to SOCKETSHR
+.ifdef DECC_SOCKETS
+.else
+.ifdef SOCKETSHR_SOCKETS
+.else
+.ifdef SOCKET
+SOCKETSHR_SOCKETS=1
+.endif
+.endif
+.endif
+
 
 ARCHDIR =  [.lib.$(ARCH).$(PERL_VERSION)]
 ARCHCORE = [.lib.$(ARCH).$(PERL_VERSION).CORE]
@@ -78,6 +100,9 @@ ARCHAUTO = [.lib.$(ARCH).$(PERL_VERSION).auto]
 PIPES_BROKEN = 1
 .endif
 
+.ifdef __DEBUG__
+NOX2P = 1
+.endif
 
 #: >>>>>Compiler-specific options <<<<<
 .ifdef GNUC
@@ -150,8 +175,13 @@ DBG =
 #: By default, used SOCKETSHR library; see ReadMe.VMS
 #: for information on changing socket support
 .ifdef SOCKET
+.ifdef DECC_SOCKETS
+SOCKDEF = ,VMS_DO_SOCKETS,DECCRTL_SOCKETS
+SOCKLIB = 
+.else
 SOCKDEF = ,VMS_DO_SOCKETS
 SOCKLIB = SocketShr/Share
+.endif
 # N.B. the targets for $(SOCKC) and $(SOCKH) assume that the permanent
 # copies live in [.vms], and the `clean' target will delete copies of
 # these files in the current default directory.
@@ -272,8 +302,13 @@ LIBPREREQ = $(ARCHDIR)Config.pm [.lib]DynaLoader.pm [.lib]vmsish.pm [.lib.VMS]Fi
 utils1 = [.lib.pod]perldoc.com [.lib.ExtUtils]Miniperl.pm [.utils]c2ph.com [.utils]h2ph.com [.utils]h2xs.com [.lib]perlbug.com
 utils2 = [.lib]splain.com [.utils]pl2pm.com
 
+.ifdef NOX2P
+all : base extras archcorefiles preplibrary perlpods
+       @ $(NOOP)
+.else
 all : base extras x2p archcorefiles preplibrary perlpods
        @ $(NOOP)
+.endif
 base : miniperl perl
        @ $(NOOP)
 extras : Fcntl IO Opcode $(POSIX) libmods utils podxform