[GNUnet-SVN] [gnurl] 77/205: winbuild: add basic support for OpenSSL 1.1.x

[gnunet]

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