Commit 51d8e5ea authored by Richard Levitte's avatar Richard Levitte Committed by Richard Levitte
Browse files

Windows: use default ZLIB1 unless --with-zlib-lib is set 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1772)
(cherry picked from commit 475592e2)
parent f02ec655

Configurations/00-base-templates.conf

+3 −2
Original line number Diff line number Diff line
@@ -80,10 +80,11 @@ 
            sub {

                unless ($disabled{zlib}) {

                    if (defined($disabled{"zlib-dynamic"})) {

                        return $withargs{zlib_lib};

                        return $withargs{zlib_lib} // "ZLIB1";

                    }

                }

                return (); },

                return ();

            },



        ld              => "link",

        lflags          => "/nologo",