diff options
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 5 | ||||
| -rw-r--r-- | VMS/openssl_shutdown.com.in | 8 | ||||
| -rw-r--r-- | VMS/openssl_startup.com.in | 8 |
3 files changed, 8 insertions, 13 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 83ee61482e..6d08ae8cad 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -405,7 +405,10 @@ vmsconfig.pm : configdata.pm WRITE CONFIG " OPENSSLDIR => '$(OPENSSLDIR)'," WRITE CONFIG " pointersize => '","{- $target{pointersize} -}","'," WRITE CONFIG " shared_libs => [" - {- join("\n ", map { "WRITE CONFIG \" '$_'," } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) || "\@ !" -} + {- $disabled{shared} + ? "\@ !" + : join("\n ", map { "WRITE CONFIG \" '$_'," } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) + -} WRITE CONFIG " ]," WRITE CONFIG ");" WRITE CONFIG "our %target = ();" diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in index 236979eab2..5385362304 100644 --- a/VMS/openssl_shutdown.com.in +++ b/VMS/openssl_shutdown.com.in @@ -39,9 +39,7 @@ $ DEAS OSSL$LIB'v' $ DEAS OSSL$SHARE'v' $ DEAS OSSL$ENGINES'v' $ DEAS OSSL$EXE'v' -$ {- output_off() if $disabled{shared} -} -$ {- join("\n\$ ", map { "DEAS $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -} -$ {- output_on() -} +$ {- join("\n\$ ", map { my $x = uc $_; "DEAS ${x}'v'" } @{$config{shared_libs}}) -} $ IF P2 .NES. "NOALIASES" $ THEN $ DEAS OSSL$ROOT @@ -51,9 +49,7 @@ $ DEAS OSSL$SHARE $ DEAS OSSL$ENGINES $ DEAS OSSL$EXE $ DEAS OPENSSL -$ {- output_off() if $disabled{shared} -} -$ {- join("\n\$ ", map { "DEAS $_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -} -$ {- output_on() -} +$ {- join("\n\$ ", map { my $x = uc $_; "DEAS ${x}" } @{$config{shared_libs}}) -} $ ENDIF $ $ EXIT 'status' diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in index caad02278b..e5043b5bb0 100644 --- a/VMS/openssl_startup.com.in +++ b/VMS/openssl_startup.com.in @@ -90,9 +90,7 @@ $ DEF OSSL$LIB'v' OSSL$INSTROOT:[LIB.'arch'] $ DEF OSSL$SHARE'v' OSSL$INSTROOT:[LIB.'arch'] $ DEF OSSL$ENGINES'v' OSSL$INSTROOT:[ENGINES.'arch'] $ DEF OSSL$EXE'v' OSSL$INSTROOT:[EXE.'arch'] -$ {- output_off() if $disabled{shared} -} -$ {- join("\n\$ ", map { "DEF $_'v' OSSL\$SHARE:$_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -} -$ {- output_on() -} +$ {- join("\n\$ ", map { my $x = uc $_; "DEF ${x}'v' OSSL\$SHARE:${x}" } @{$config{shared_libs}}) -} $ IF P2 .NES. "NOALIASES" $ THEN $ DEF OSSL$INSTROOT OSSL$INSTROOT'v' @@ -102,9 +100,7 @@ $ DEF OSSL$SHARE OSSL$SHARE'v' $ DEF OSSL$ENGINES OSSL$ENGINES'v' $ DEF OSSL$EXE OSSL$EXE'v' $ DEF OPENSSL OSSL$INCLUDE:[OPENSSL] -$ {- output_off() if $disabled{shared} -} -$ {- join("\n\$ ", map { "DEF $_ $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -} -$ {- output_on() -} +$ {- join("\n\$ ", map { my $x = uc $_; "DEF ${x} ${x}'v'" } @{$config{shared_libs}}) -} $ ENDIF $ $ DEFT OSSL$DATAROOT 'OPENSSLDIR_' |