diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-19 22:08:37 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-20 16:51:31 +0100 |
| commit | 343ec2b083b82ccf9ce96020bc95320390296f1f (patch) | |
| tree | e159c94c1ebe2bb60fec21911c095b74e15865fe /util | |
| parent | 45502bfe19fb03c9f343b03fa6434ee0bece8428 (diff) | |
Build dynamic engines even if configured "no-shared"
Until now, the engines in engines/ were only built as dynamicaly
loadable ones if shared libraries were built.
We not dissociate the two and can build dynamicaly loadable engines
even if we only build static libcrypto and libssl. This is controlled
with the option (enable|disable|no)-static-engine, defaulting to
no-static-engine.
Note that the engines in crypto/engine/ (dynamic and cryptodev) will
always be built into libcrypto.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 08999bfe72..3e8967c315 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -176,8 +176,6 @@ foreach (grep(!/^$/, split(/ /, $OPTIONS))) print STDERR "unknown option - $_\n" if !&read_options; } -$no_static_engine = 0 if (!$shlib); - $no_mdc2=1 if ($no_des); $no_ssl3=1 if ($no_md5); @@ -1463,11 +1461,11 @@ sub read_options { $zlib_opt = 2; } - elsif (/^no-static-engine/) + elsif (/^no-static-engine/ or /^enable-dynamic-engine/) { $no_static_engine = 1; } - elsif (/^enable-static-engine/) + elsif (/^no-dynamic-engine/ or /^enable-static-engine/) { $no_static_engine = 0; } |