diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2007-01-25 22:39:08 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2007-01-25 22:39:08 +0000 |
commit | f1c2ab35db033548e4cb2eeafa9fbde733687e0a (patch) | |
tree | 1eda969566d68e43bc7ad9c432b294bb522f9df6 | |
parent | 7506ac8d2537ecabde5367417c5f6741b01cb904 (diff) | |
download | openssl-new-f1c2ab35db033548e4cb2eeafa9fbde733687e0a.tar.gz |
Fix to make install works in all configurations.
-rwxr-xr-x | Configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1372,18 +1372,20 @@ while (<IN>) { s/^FIPSCANLIB=.*/FIPSCANLIB=libfips/; s/^SHARED_FIPS=.*/SHARED_FIPS=libfips\$(SHLIB_EXT)/; + s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl fips/; } else { - s/^FIPSCANLIB=.*/FIPSCANLIB=/; + s/^FIPSCANLIB=.*/FIPSCANLIB=libcrypto/; s/^SHARED_FIPS=.*/SHARED_FIPS=/; + s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl/; } s/^FIPSCANISTERINTERNAL=.*/FIPSCANISTERINTERNAL=$fipscanisterinternal/; s/^BASEADDR=.*/BASEADDR=$baseaddr/; s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/; s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/; s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/; - s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared); + s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL) \$(SHARED_FIPS)/ if (!$no_shared); if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/) { my $sotmp = $1; |