diff options
author | Richard Levitte <levitte@openssl.org> | 2000-07-24 20:36:46 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2000-07-24 20:36:46 +0000 |
commit | f4316c36df46f888b5e63f0efb4af0898a66b272 (patch) | |
tree | ee3bd93886e41151437f6390cced7b74213ef3ca /Configure | |
parent | 8886f118db26b4c38e15941ac739bbd9a1b05932 (diff) |
Avoid loops, and make sure that it's possible to still build shared
libraries even if the "shared" configuration option wasn't chosen.
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -639,14 +639,17 @@ if ($threads) $openssl_thread_defines .= $thread_defines; } -if ($no_shared) - { - $shared_target = ""; - $shared_cflag = ""; - } -else +# You will find shlib_mark1 and shlib_mark2 explained in Makefile.org +my $shared_mark1 = ""; +my $shared_mark2 = ""; +if ($shared_cflag ne "") { $cflags = "$shared_cflag $cflags"; + if (!$no_shared) + { + $shared_mark1 = ".shlib-clean."; + $shared_mark2 = ".shlib."; + } } #my ($bn1)=split(/\s+/,$bn_obj); @@ -751,6 +754,8 @@ while (<IN>) s/^RANLIB=.*/RANLIB= $ranlib/; s/^PERL=.*/PERL= $perl/; s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/; + s/^SHLIB_MARK1=.*/SHLIB_MARK1=$shared_mark1/; + s/^SHLIB_MARK2=.*/SHLIB_MARK2=$shared_mark2/; s/^LIBS=.*/LIBS=libcrypto\.so\* libssl\.so\*/ if (!$no_shared); print OUT $_."\n"; } |