mirror of
https://abf.rosa.ru/djam/curl.git
synced 2025-02-23 15:52:59 +00:00
39 lines
1.3 KiB
Diff
39 lines
1.3 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/configure.ac b/configure.ac
|
|
index 39bdb5ef1..1f0b02dc2 100755
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1755,13 +1755,13 @@ if test -z "$ssl_backends" -o "x$OPT_SSL" != xno &&
|
|
case "$OPT_SSL" in
|
|
yes)
|
|
dnl --with-ssl (without path) used
|
|
- PKGTEST="yes"
|
|
+ PKGTEST="no"
|
|
PREFIX_OPENSSL=/usr/local/ssl
|
|
LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
|
|
;;
|
|
off)
|
|
dnl no --with-ssl option given, just check default places
|
|
- PKGTEST="yes"
|
|
+ PKGTEST="no"
|
|
PREFIX_OPENSSL=
|
|
;;
|
|
*)
|
|
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
|