diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-02-08 23:26:22 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-02-09 14:27:31 +0100 |
| commit | 368297d17352c7eb30efff443509caf7cf59f65f (patch) | |
| tree | 27c18b58b59cbf197372b28404327dbb1d7c7c9c /Configurations/00-base-templates.conf | |
| parent | f3ac964ba431c91b3a8b47f2ad2e82ee52fcc5ff (diff) | |
Configuration: move the handling of zlib_include to config files
It was a bit absurd to have this being specially handled in the build
file templates, especially that we have the 'includes' attribute.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5296)
Diffstat (limited to 'Configurations/00-base-templates.conf')
| -rw-r--r-- | Configurations/00-base-templates.conf | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 0d0f8b8a7f..951aeaa599 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -7,6 +7,7 @@ my %targets=( cppflags => "", lflags => "", defines => [], + includes => [], thread_scheme => "(unknown)", # Assume we don't know thread_defines => [], @@ -70,6 +71,13 @@ my %targets=( push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"}; return [ @defs ]; }, + includes => + sub { + my @incs = (); + push @incs, $withargs{zlib_include} + if !$disabled{zlib} && $withargs{zlib_include}; + return [ @incs ]; + }, }, BASE_unix => { @@ -129,6 +137,16 @@ my %targets=( inherit_from => [ "BASE_common" ], template => 1, + includes => + add(sub { + my @incs = (); + # GNV$ZLIB_INCLUDE is the standard logical name for later + # zlib incarnations. + push @incs, 'GNV$ZLIB_INCLUDE:' + if !$disabled{zlib} && !$withargs{zlib_include}; + return [ @incs ]; + }), + build_file => "descrip.mms", build_scheme => [ "unified", "VMS" ], }, |