Configure - move the addition of the zlib / libz lib to configs

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

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 3424f1208920c5d2cbbff318a3232437ff1ca955..60cd90eec126ee83f67f40a9c76c0feaa9677008 100644 (file)
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -45,12 +45,37 @@
     },
 
     BASE_common => {
+       template        => 1,
+       defines         =>
+           [ sub {
+               unless ($disabled{zlib}) {
+                   if (defined($disabled{"zlib-dynamic"})) {
+                       return "ZLIB";
+                   } else {
+                       return "ZLIB_SHARED";
+                   }
+               }
+               return (); }
+           ],
     },
 
     BASE_unix => {
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
+        ex_libs         =>
+            sub {
+                unless ($disabled{zlib}) {
+                    if (defined($disabled{"zlib-dynamic"})) {
+                        if (defined($withargs{zlib_lib})) {
+                            return "-L".$withargs{zlib_lib}." -lz";
+                        } else {
+                            return "-lz";
+                        }
+                    }
+                }
+                return (); },
+
         build_scheme    => "unixmake",
         build_file      => "Makefile",
     },
@@ -59,6 +84,15 @@
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
+        ex_libs         =>
+            sub {
+                unless ($disabled{zlib}) {
+                    if (defined($disabled{"zlib-dynamic"})) {
+                        return "zlib1.lib";
+                    }
+                }
+                return (); },
+
         build_scheme    => [ "mk1mf" ],
     },
 
@@ -66,6 +100,19 @@
         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" ],
     },