VMS: If configured no-shared, don't provide shareable image logical names

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/VMS/openssl_ivp.com.in b/VMS/openssl_ivp.com.in
index 6a944fadefcefaf11bfc8e5a7793e6c8dea8ca28..3555bf60236e2e45505ce614081de2d273345461 100644 (file)
--- a/VMS/openssl_ivp.com.in
+++ b/VMS/openssl_ivp.com.in
@@ -21,9 +21,9 @@ $     @'INSTALLTOP_'SYS$STARTUP]openssl_startup'v'
 $      @'INSTALLTOP_'SYS$STARTUP]openssl_utils'v'
 $
 $      IF F$SEARCH("OSSL$LIBCRYPTO''pz'") .EQS. "" -
 $      @'INSTALLTOP_'SYS$STARTUP]openssl_utils'v'
 $
 $      IF F$SEARCH("OSSL$LIBCRYPTO''pz'") .EQS. "" -

-           .OR. F$SEARCH("OSSL$LIBSSL''pz'") .EQS. "" -
+           .OR. F$SEARCH("OSSL$LIBSSL''pz'") .EQS. "" {- output_off() if $config{no_shared}; "" -}-

            .OR. F$SEARCH("OSSL$LIBCRYPTO_SHR''pz'") .EQS. "" -
            .OR. F$SEARCH("OSSL$LIBCRYPTO_SHR''pz'") .EQS. "" -

-           .OR. F$SEARCH("OSSL$LIBSSL_SHR''pz'") .EQS. "" -
+           .OR. F$SEARCH("OSSL$LIBSSL_SHR''pz'") .EQS. "" {- output_on() if $config{no_shared}; "" -}-

            .OR. F$SEARCH("OSSL$INCLUDE:[OPENSSL]crypto.h") .EQS. "" -
            .OR. F$SEARCH("OPENSSL:crypto.h") .EQS. "" -
            .OR. F$SEARCH("OSSL$EXE:OPENSSL''v'.EXE") .EQS. ""
            .OR. F$SEARCH("OSSL$INCLUDE:[OPENSSL]crypto.h") .EQS. "" -
            .OR. F$SEARCH("OPENSSL:crypto.h") .EQS. "" -
            .OR. F$SEARCH("OSSL$EXE:OPENSSL''v'.EXE") .EQS. ""

diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in
index 385903fa7dde0dd913860517a378d8d043d23d72..f0df1c1c356f419b88b970fb9f6ccb1452a6f2bf 100644 (file)
--- a/VMS/openssl_shutdown.com.in
+++ b/VMS/openssl_shutdown.com.in
@@ -38,15 +38,19 @@ $   DEAS OSSL$ENGINES'sv'
 $      DEAS OSSL$EXE
 $      DEAS OSSL$LIBCRYPTO'pz'
 $      DEAS OSSL$LIBSSL'pz'
 $      DEAS OSSL$EXE
 $      DEAS OSSL$LIBCRYPTO'pz'
 $      DEAS OSSL$LIBSSL'pz'

+${- output_off() if $config{no_shared}; "" -}

 $      DEAS OSSL$LIBCRYPTO'sv'_SHR'pz'
 $      DEAS OSSL$LIBSSL'sv'_SHR'pz'
 $      DEAS OSSL$LIBCRYPTO'sv'_SHR'pz'
 $      DEAS OSSL$LIBSSL'sv'_SHR'pz'

+${- output_on() if $config{no_shared}; "" -}

 $      DEAS OPENSSL
 $
 $      IF P2 .NES. "NOALIASES"
 $      THEN
 $          DEAS OSSL$ENGINES
 $      DEAS OPENSSL
 $
 $      IF P2 .NES. "NOALIASES"
 $      THEN
 $          DEAS OSSL$ENGINES

+${- output_off() if $config{no_shared}; "" -}

 $          DEAS OSSL$LIBCRYPTO_SHR'pz'
 $          DEAS OSSL$LIBSSL_SHR'pz'
 $          DEAS OSSL$LIBCRYPTO_SHR'pz'
 $          DEAS OSSL$LIBSSL_SHR'pz'

+${- output_on() if $config{no_shared}; "" -}

 $      ENDIF
 $
 $      EXIT 'status'
 $      ENDIF
 $
 $      EXIT 'status'

diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index 511c133f019da57a2c92fd946b3850ddafc8c502..9c8c09ac9c8a31046478f6c05317fb9bfcd37495 100644 (file)
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -101,15 +101,19 @@ $ DEF  OSSL$EXE                   OSSL$INSTROOT:[EXE.'arch'],-
                                        OSSL$INSTROOT:[EXE]
 $      DEF  OSSL$LIBCRYPTO'pz'         OSSL$LIB:OSSL$LIBCRYPTO'pz'.OLB
 $      DEF  OSSL$LIBSSL'pz'            OSSL$LIB:OSSL$LIBSSL'pz'.OLB
                                        OSSL$INSTROOT:[EXE]
 $      DEF  OSSL$LIBCRYPTO'pz'         OSSL$LIB:OSSL$LIBCRYPTO'pz'.OLB
 $      DEF  OSSL$LIBSSL'pz'            OSSL$LIB:OSSL$LIBSSL'pz'.OLB

+${- output_off() if $config{no_shared}; "" -}

 $      DEF  OSSL$LIBCRYPTO'sv'_SHR'pz' OSSL$SHARE:OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE
 $      DEF  OSSL$LIBSSL'sv'_SHR'pz'    OSSL$SHARE:OSSL$LIBSSL'sv'_SHR'pz'.EXE
 $      DEF  OSSL$LIBCRYPTO'sv'_SHR'pz' OSSL$SHARE:OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE
 $      DEF  OSSL$LIBSSL'sv'_SHR'pz'    OSSL$SHARE:OSSL$LIBSSL'sv'_SHR'pz'.EXE

+${- output_on() if $config{no_shared}; "" -}

 $      DEF  OPENSSL                    OSSL$INCLUDE:[OPENSSL]
 $
 $      IF P2 .NES. "NOALIASES"
 $      THEN
 $          DEF OSSL$ENGINES'pz'        OSSL$ENGINES'sv''pz'
 $      DEF  OPENSSL                    OSSL$INCLUDE:[OPENSSL]
 $
 $      IF P2 .NES. "NOALIASES"
 $      THEN
 $          DEF OSSL$ENGINES'pz'        OSSL$ENGINES'sv''pz'

+${- output_off() if $config{no_shared}; "" -}

 $          DEF OSSL$LIBCRYPTO_SHR'pz'  OSSL$LIBCRYPTO'sv'_SHR'pz'
 $          DEF OSSL$LIBSSL_SHR'pz'     OSSL$LIBSSL'sv'_SHR'pz'
 $          DEF OSSL$LIBCRYPTO_SHR'pz'  OSSL$LIBCRYPTO'sv'_SHR'pz'
 $          DEF OSSL$LIBSSL_SHR'pz'     OSSL$LIBSSL'sv'_SHR'pz'

+${- output_on() if $config{no_shared}; "" -}

 $      ENDIF
 $
 $ bailout:
 $      ENDIF
 $
 $ bailout: