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

[thirdparty/openssl.git] / Configure

diff --git a/Configure b/Configure
index 9226b90f329d18afa507e127f3ee02dc7f0d0ac0..57a57bd330ad9b26d1dc5107e10c0348714ec3b8 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -138,6 +138,7 @@ my $apitable = {
 
 our %table = ();
 our %config = ();
+our %withargs = ();
 
 # Forward declarations ###############################################
 
@@ -437,7 +438,6 @@ $config{openssl_other_defines}=[];
 my $libs="";
 my $target="";
 $config{options}="";
-my %withargs=();
 my $build_prefix = "release_";
 
 my @argvcopy=@ARGV;
@@ -980,26 +980,6 @@ if ($threads)
        push @{$config{openssl_thread_defines}}, @thread_defines;
        }
 
-unless ($disabled{zlib})
-       {
-       push @{$config{defines}}, "ZLIB";
-       if (defined($disabled{"zlib-dynamic"}))
-               {
-               if (defined($withargs{zlib_lib}))
-                       {
-                       $config{ex_libs} .= " -L" . $withargs{zlib_lib} . " -lz";
-                       }
-               else
-                       {
-                       $config{ex_libs} .= " -lz";
-                       }
-               }
-       else
-               {
-               push @{$config{defines}}, "ZLIB_SHARED";
-               }
-       }
-
 # With "deprecated" disable all deprecated features.
 if (defined($disabled{"deprecated"})) {
         $config{api} = $maxapi;