generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Michael Lee 2016-02-03 11:31:40 -05:00 committed by Richard Levitte
parent dc5744cb78
commit 20a5819f13
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Configure
View File

@ -596,11 +596,11 @@ foreach (@argvcopy)
} }
elsif (/^--with-zlib-lib=(.*)$/) elsif (/^--with-zlib-lib=(.*)$/)
{ {
$withargs{"zlib-lib"}=$1; $withargs{zlib_lib}=$1;
} }
elsif (/^--with-zlib-include=(.*)$/) elsif (/^--with-zlib-include=(.*)$/)
{ {
$withargs{"zlib-include"}="-I$1"; $withargs{zlib_include}="-I$1";
} }
elsif (/^--with-fipslibdir=(.*)$/) elsif (/^--with-fipslibdir=(.*)$/)
{ {
@ -937,9 +937,9 @@ if ($zlib)
$config{cflags} = "-DZLIB $config{cflags}"; $config{cflags} = "-DZLIB $config{cflags}";
if (defined($disabled{"zlib-dynamic"})) 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 else
{ {

4
Makefile.in
View File

@ -110,8 +110,8 @@ POLY1305_ASM_OBJ= {- $target{poly1305_obj} -}
PERLASM_SCHEME= {- $target{perlasm_scheme} -} PERLASM_SCHEME= {- $target{perlasm_scheme} -}
# Zlib stuff # Zlib stuff
ZLIB_INCLUDE={- $withargs{zlib-include} -} ZLIB_INCLUDE={- $withargs{zlib_include} -}
LIBZLIB={- $withargs{zlib-lib} -} LIBZLIB={- $withargs{zlib_lib} -}
# This is the location of fipscanister.o and friends. # This is the location of fipscanister.o and friends.
# The FIPS module build will place it $(INSTALLTOP)/lib # The FIPS module build will place it $(INSTALLTOP)/lib