Fix zlib configuration options.

[openssl.git] / Configurations / 10-main.conf

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 6b10d70c356dda1c2658c65265074252879b658c..52953a723077362265fba9d21a71c70c04399f9c 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -85,6 +85,18 @@ sub vms_info {
        if ($? == 0) {
            push @{$vms_info->{disable_warns_p64}}, "MAYLOSEDATA3";
        }
+
+        unless ($disabled{zlib}) {
+            if (defined($disabled{"zlib-dynamic"})) {
+                $vms_info->{zlib} = $withargs{zlib_lib} || 'GNV$LIBZSHR/SHARE';
+                $vms_info->{zlib_p32} = $withargs{zlib_lib} || 'GNV$LIBZSHR32/SHARE';
+                $vms_info->{zlib_p64} = $withargs{zlib_lib} || 'GNV$LIBZSHR64/SHARE';
+            } else {
+                $vms_info->{def_zlib} = $withargs{zlib_lib} || 'GNV$LIBZSHR';
+                $vms_info->{def_zlib_p32} = $withargs{zlib_lib} || 'GNV$LIBZSHR32';
+                $vms_info->{def_zlib_p64} = $withargs{zlib_lib} || 'GNV$LIBZSHR64';
+            }
+        }
     }
     return $vms_info;
 }
@@ -1755,6 +1767,12 @@ sub vms_info {
                                           @{vms_info()->{disable_warns}};
                                       @warnings
                                           ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }),
+        defines          =>
+                    add(sub {
+                            return vms_info()->{def_zlib}
+                                ? "LIBZ=\"\"\"".vms_info()->{def_zlib}."\"\"\"" : ();
+                            }),
+        ex_libs          => add(sub { return vms_info()->{zlib} || (); }),
         #as               => "???",
         #debug_aflags     => "/NOOPTIMIZE/DEBUG",
         #release_aflags   => "/OPTIMIZE/NODEBUG",
@@ -1769,7 +1787,12 @@ sub vms_info {
                       @warnings
                           ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : ();
                 } ),
-        ex_libs          => sub { join(",", map { s|SHR([\./])|SHR32$1|g; $_ } @_) },
+        defines          =>
+                    add(sub {
+                            return vms_info()->{def_zlib_p32}
+                                ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p32}."\"\"\"" : ();
+                            }),
+        ex_libs          => add(sub { return vms_info()->{zlib_p32} || (); }),
     },
     "vms-alpha-p64" => {
         inherit_from     => [ "vms-alpha" ],
@@ -1780,7 +1803,12 @@ sub vms_info {
                       @warnings
                           ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : ();
                 } ),
-        ex_libs          => sub { join(",", map { s|SHR([\./])|SHR64$1|g; $_ } @_) },
+        defines          =>
+                    add(sub {
+                            return vms_info()->{def_zlib_p64}
+                                ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p64}."\"\"\"" : ();
+                            }),
+        ex_libs          => add(sub { return vms_info()->{zlib_p64} || (); }),
     },
     "vms-ia64" => {
         inherit_from     => [ "vms-generic" ],
@@ -1788,6 +1816,12 @@ sub vms_info {
                                           @{vms_info()->{disable_warns}};
                                       @warnings
                                           ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }),
+        defines          =>
+                    add(sub {
+                            return vms_info()->{def_zlib}
+                                ? "LIBZ=\"\"\"".vms_info()->{def_zlib}."\"\"\"" : ();
+                            }),
+        ex_libs          => add(sub { return vms_info()->{zlib} || (); }),
         #as               => "I4S",
         #debug_aflags     => "/NOOPTIMIZE/DEBUG",
         #release_aflags   => "/OPTIMIZE/NODEBUG",
@@ -1802,7 +1836,12 @@ sub vms_info {
                       @warnings
                           ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : ();
                 } ),
-        ex_libs          => sub { join(",", map { s|SHR([\./])|SHR32$1|g; $_ } @_) },
+        defines          =>
+                    add(sub {
+                            return vms_info()->{def_zlib_p32}
+                                ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p32}."\"\"\"" : ();
+                            }),
+        ex_libs          => add(sub { return vms_info()->{zlib_p32} || (); }),
     },
     "vms-ia64-p64" => {
         inherit_from     => [ "vms-ia64" ],
@@ -1813,7 +1852,12 @@ sub vms_info {
                       @warnings
                           ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : ();
                 } ),
-        ex_libs          => sub { join(",", map { s|SHR([\./])|SHR64$1|g; $_ } @_) },
+        defines          =>
+                    add(sub {
+                            return vms_info()->{def_zlib_p64}
+                                ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p64}."\"\"\"" : ();
+                            }),
+        ex_libs          => add(sub { return vms_info()->{zlib_p64} || (); }),
     },
 
 );