Commit 20a5819f authored by Michael Lee's avatar Michael Lee Committed by Richard Levitte
Browse files

[Configure] Make --with-zlib-* work with configdata.pm 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent dc5744cb

Configure

+4 −4
Original line number Diff line number Diff line
@@ -596,11 +596,11 @@ foreach (@argvcopy) 
			}

		elsif (/^--with-zlib-lib=(.*)$/)

			{

			$withargs{"zlib-lib"}=$1;

			$withargs{zlib_lib}=$1;

			}

		elsif (/^--with-zlib-include=(.*)$/)

			{

			$withargs{"zlib-include"}="-I$1";

			$withargs{zlib_include}="-I$1";

			}

		elsif (/^--with-fipslibdir=(.*)$/)

			{
@@ -937,9 +937,9 @@ if ($zlib) 
	$config{cflags} = "-DZLIB $config{cflags}";

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

		{

		if (defined($withargs{"zlib-lib"}))

		if (defined($withargs{zlib_lib}))

			{

			$config{ex_libs} .= " -L" . $withargs{"zlib-lib"} . " -lz";

			$config{ex_libs} .= " -L" . $withargs{zlib_lib} . " -lz";

			}

		else

			{

Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ POLY1305_ASM_OBJ= {- $target{poly1305_obj} -} 
PERLASM_SCHEME= {- $target{perlasm_scheme} -}



# Zlib stuff

ZLIB_INCLUDE={- $withargs{zlib-include} -}

LIBZLIB={- $withargs{zlib-lib} -}

ZLIB_INCLUDE={- $withargs{zlib_include} -}

LIBZLIB={- $withargs{zlib_lib} -}



# This is the location of fipscanister.o and friends.

# The FIPS module build will place it $(INSTALLTOP)/lib