diff options
author | Matt Caswell <matt@openssl.org> | 2014-12-18 15:03:09 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2014-12-18 19:57:44 +0000 |
commit | c0fc27f88ea0933a3e201325fc683b52fe55d848 (patch) | |
tree | 9592fb3af3318351fdf09cb7742b80eb27e928eb /Configure | |
parent | bd2bd374b37a3718be4a6c0c198be8ff3123c81a (diff) | |
download | openssl-c0fc27f88ea0933a3e201325fc683b52fe55d848.tar.gz |
Made it an error to define OPENSSL_USE_DEPRECATED if OpenSSL has been built
with OPENSSL_NO_DEPRECATED defined
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1419,8 +1419,11 @@ if ($zlib) } } -#Always build the library with OPENSSL_USE_DEPRECATED. This is overridden by OPENSSL_NO_DEPRECATED -$cflags = "-DOPENSSL_USE_DEPRECATED $cflags"; +#Build the library with OPENSSL_USE_DEPRECATED if deprecation is not disabled +if(!defined($disabled{"deprecated"})) + { + $cflags = "-DOPENSSL_USE_DEPRECATED $cflags"; + } # You will find shlib_mark1 and shlib_mark2 explained in Makefile.org my $shared_mark = ""; |