[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 77/205: winbuild: add basic support for OpenSSL 1.1
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 77/205: winbuild: add basic support for OpenSSL 1.1.x |
Date: |
Thu, 20 Apr 2017 16:20:17 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit db87bcfcf21f8c3b8188d0c5ab82faf804ffd5ea
Author: Anatol Belski <address@hidden>
AuthorDate: Fri Mar 10 17:04:45 2017 +0100
winbuild: add basic support for OpenSSL 1.1.x
- Auto-detect OpenSSL 1.1 libs
Closes https://github.com/curl/curl/pull/1322
---
winbuild/MakefileBuild.vc | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 96ab37ef8..f8296718b 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -114,11 +114,19 @@ LFLAGS = $(LFLAGS) "/LIBPATH:$(DEVEL_LIB)"
!IF "$(WITH_SSL)"=="dll"
+!IF EXISTS("$(DEVEL_LIB)\libssl.lib")
+SSL_LIBS = libssl.lib libcrypto.lib
+!ELSE
SSL_LIBS = libeay32.lib ssleay32.lib
+!ENDIF
USE_SSL = true
SSL = dll
!ELSEIF "$(WITH_SSL)"=="static"
+!IF EXISTS("$(DEVEL_LIB)\libssl.lib")
+SSL_LIBS = libssl.lib libcrypto.lib gdi32.lib user32.lib crypt32.lib
+!ELSE
SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib crypt32.lib
+!ENDIF
USE_SSL = true
SSL = static
!ENDIF
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 147/205: multi: make curl_multi_wait avoid malloc in the typical case, (continued)
- [GNUnet-SVN] [gnurl] 147/205: multi: make curl_multi_wait avoid malloc in the typical case, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 196/205: extern-scan.pl: strip trailing CR, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 174/205: vtls: fix unreferenced variable warnings, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 191/205: http2: fix handle leak in error path, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 24/205: fix some typos in the doc (#1306), gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 64/205: authneg: clear auth.multi flag at http_done, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 104/205: tests/README: mention nroff for --manual tests, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 73/205: tests: clear the SSL_CERT_FILE variable on --libcurl tests, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 55/205: mkhelp: simplified the gzip code, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 102/205: travis: run tests-nonflaky instead of tests-full, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 77/205: winbuild: add basic support for OpenSSL 1.1.x,
gnunet <=
- [GNUnet-SVN] [gnurl] 41/205: http2: Fix assertion error on redirect with CL=0, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 46/205: maketgz: Run updatemanpages.pl to update man pages, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 124/205: RELEASE-NOTES: synced with 556c51a2df, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 127/205: docs/Makefile.am: include CMakeLists.txt in the dist tarball, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 90/205: runtests.pl: fixed display of the Gopher IPv6 port number, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 125/205: curl: fix callback argument inconsistency, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 131/205: connect: fix unreferenced parameter warning, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 105/205: mkhelp: disable compression if the perl gzip module is unavailable, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 19/205: no-keepalive.d: fix typo, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 123/205: KNOWN_BUGS: typo, gnunet, 2017/04/20