From: Dmitry Volyntsev Date: Wed, 29 Dec 2021 18:26:40 +0000 (+0000) Subject: Improved discovery of OpenSSL libraries. X-Git-Tag: 0.7.2~18 X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=dc207775a557eef78c57d7b04b3e64d1804dc937;p=njs.git Improved discovery of OpenSSL libraries. Trying to link again the library using --cc-opt and --ld-opt before attempting to use the default. This change is similar to 9e2e4d04dfc4 (0.7.1) made for PCRE. --- diff --git a/auto/openssl b/auto/openssl index adca5887..a61daa29 100644 --- a/auto/openssl +++ b/auto/openssl @@ -13,7 +13,7 @@ if [ $NJS_OPENSSL = YES ]; then njs_feature_name=NJS_HAVE_OPENSSL njs_feature_run=yes njs_feature_incs= - njs_feature_libs="-lcrypto" + njs_feature_libs="" njs_feature_test="#include int main() { @@ -24,6 +24,13 @@ if [ $NJS_OPENSSL = YES ]; then }" . auto/feature + if [ $njs_found = no ]; then + njs_feature="OpenSSL library -lcrypto" + njs_feature_libs="-lcrypto" + + . auto/feature + fi + if [ $njs_found = yes ]; then njs_feature="OpenSSL version"