From 20a5819f135cf55716cf4bea65deb24569016c9b Mon Sep 17 00:00:00 2001 From: Michael Lee Date: Wed, 3 Feb 2016 11:31:40 -0500 Subject: [PATCH] [Configure] Make --with-zlib-* work with configdata.pm Reviewed-by: Rich Salz Reviewed-by: Richard Levitte --- Configure | 8 ++++---- Makefile.in | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Configure b/Configure index 44cb40b7c1..40bc7573ff 100755 --- a/Configure +++ b/Configure @@ -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 { diff --git a/Makefile.in b/Makefile.in index 09f5db309d..85685c52e9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 -- 2.25.1