mirror of
https://abf.rosa.ru/djam/curl.git
synced 2025-02-23 15:52:59 +00:00
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
This script finds system OpenSSL despite I want it to use LibreSSL from /opt/libressl
|
|
Do not find it automatically -- we have set $LIBS and $PREFIX_OPENSSL
|
|
// mikhailnov, 25.12.2019
|
|
|
|
diff --git a/libcurl.pc.in b/libcurl.pc.in
|
|
index 8ac15d407..19cb8e24d 100644
|
|
--- a/libcurl.pc.in
|
|
+++ b/libcurl.pc.in
|
|
@@ -34,6 +34,7 @@ Name: libcurl
|
|
URL: https://curl.se/
|
|
Description: Library to transfer files with ftp, http, etc.
|
|
Version: @CURLVERSION@
|
|
-Libs: -L${libdir} -lcurl @LIBCURL_NO_SHARED@
|
|
-Libs.private: @LIBCURL_LIBS@
|
|
-Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@
|
|
+Libs: -L${libdir} -lcurl @LIBCURL_NO_SHARED@ @LIBRESSL_LIBS@
|
|
+Libs.private: @LIBCURL_LIBS@ @LIBRESSL_LIBS_PRIVATE@
|
|
+Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ @LIBRESSL_CFLAGS@
|
|
+Requires.private: libressl
|
|
diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4
|
|
index 835768e1b..d2be47f08 100644
|
|
--- a/m4/curl-openssl.m4
|
|
+++ b/m4/curl-openssl.m4
|
|
@@ -315,7 +315,7 @@ if test "x$OPT_OPENSSL" != xno; then
|
|
case "$OPT_OPENSSL" in
|
|
yes)
|
|
dnl --with-openssl (without path) used
|
|
- PKGTEST="yes"
|
|
+ PKGTEST="no"
|
|
PREFIX_OPENSSL=
|
|
;;
|
|
*)
|