Add -lz to the ld flags when the user has chosen to link in zlib *statically*.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index f6a357b484a4e0b46b4864fc88e4b63739141e57..2566a3fbe4314bfcbc7dd3ad9b3af5b70a922f24 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -747,7 +747,20 @@ PROCESS_ARGS:
                                $depflags .= "-DOPENSSL_NO_MDC2 ";
                                $openssl_algorithm_defines .= "#define OPENSSL_NO_MDC2\n";
                                }
-                       if ($algo eq "EC" || $algo eq "SHA" || $algo eq "SHA1")
+                       if ($algo eq "EC")
+                               {
+                               push @skip, "ecdsa";
+                               push @skip, "ecdh";
+                               $options .= " no-ecdsa";
+                               $options .= " no-ecdh";
+                               $flags .= "-DOPENSSL_NO_ECDSA ";
+                               $flags .= "-DOPENSSL_NO_ECDH ";
+                               $depflags .= "-DOPENSSL_NO_ECDSA ";
+                               $depflags .= "-DOPENSSL_NO_ECDH ";
+                               $openssl_algorithm_defines .= "#define OPENSSL_NO_ECDSA\n";
+                               $openssl_algorithm_defines .= "#define OPENSSL_NO_ECDH\n";
+                               }
+                       if ($algo eq "SHA" || $algo eq "SHA1")
                                {
                                push @skip, "ecdsa";
                                $options .= " no-ecdsa";
@@ -1078,7 +1091,7 @@ if ($zlib)
        {
        $cflags = "-DZLIB $cflags";
        $cflags = "-DZLIB_SHARED $cflags" if $zlib == 2;
-       $lflags = "$lflags -lz" if $zlib == 2;
+       $lflags = "$lflags -lz" if $zlib == 1;
        }
 
 # You will find shlib_mark1 and shlib_mark2 explained in Makefile.org