Remove OPENSSL_NO_AES guards

[openssl.git] / Configurations / 00-base-templates.conf

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 5fe038cc02f3d32953d9ecf6d22d62e7d0955ee3..0211a8c936f888c5dd07952e109c0a9348f3b380 100644 (file)
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -43,16 +43,12 @@
     BASE_common => {
        template        => 1,
        defines         =>
-           [ sub {
-               unless ($disabled{zlib}) {
-                   if (defined($disabled{"zlib-dynamic"})) {
-                       return "ZLIB";
-                   } else {
-                       return "ZLIB_SHARED";
-                   }
-               }
-               return (); }
-           ],
+           sub {
+                my @defs = ();
+                push @defs, "ZLIB" unless $disabled{zlib};
+                push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"};
+                return [ @defs ];
+            },
     },
 
     BASE_unix => {
@@ -84,7 +80,7 @@
             sub {
                 unless ($disabled{zlib}) {
                     if (defined($disabled{"zlib-dynamic"})) {
-                        return "zlib1.lib";
+                        return $withargs{zlib_lib} || "zlib1.lib";
                     }
                 }
                 return (); },
@@ -104,19 +100,6 @@
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
-        ex_libs          =>
-            sub {
-                unless ($disabled{zlib}) {
-                    if (defined($disabled{"zlib-dynamic"})) {
-                        if (defined($withargs{zlib_lib})) {
-                            return $withargs{zlib_lib}.'GNV$LIBZSHR.EXE/SHARED'
-                        } else {
-                            return 'GNV$LIBZSHR/SHARE';
-                        }
-                    }
-                }
-                return (); },
-
         build_file       => "descrip.mms",
         build_scheme     => [ "unified", "VMS" ],
     },