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

Configure had the Unix centric addition of -lz when linking with zlib
is enabled, which doesn't work on other platforms.  Therefore, we move
it to the BASE_unix config template and add corresponding ones in the
other BASE_* config templates.  The Windows one is probably incomplete,
but that doesn't matter for the moment, as mk1mf does it's own thing
anyway.

This required making the %withargs table global, so perl snippets in
the configs can use it.

Reviewed-by: Andy Polyakov <appro@openssl.org>

1 files changed, 47 insertions, 0 deletions

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 3424f12089..60cd90eec1 100644
--- 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" ],
     },