diff options
| author | Andris Mednis <Andris.Mednis@zabbix.com> | 2019-03-15 21:41:06 +0300 |
|---|---|---|
| committer | Andris Mednis <Andris.Mednis@zabbix.com> | 2019-03-15 21:41:06 +0300 |
| commit | 46a83ace4c314eca82a73de11faeede33ba965b8 (patch) | |
| tree | 2504995a6e157dff0156a3d8980b178efdeb71c5 /build | |
| parent | 607967f91acf2aaad90e8657cdc5b1f8ff97e138 (diff) | |
...G...PS. [ZBX-15552] fixed compilation with LibreSSL as OpenSSL replacement and OpenSSL without PSK support
Diffstat (limited to 'build')
| -rw-r--r-- | build/win32/project/Makefile_tls.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/win32/project/Makefile_tls.inc b/build/win32/project/Makefile_tls.inc index ca13ca232fd..68c1a519e44 100644 --- a/build/win32/project/Makefile_tls.inc +++ b/build/win32/project/Makefile_tls.inc @@ -60,7 +60,7 @@ TLSLIB2 = $(TLSLIBDIR)\libssl.lib ! ERROR TLSLIBDIR "$(TLSLIBDIR)" contains libraries from OpenSSL 1.0.x (libeay32.lib, ssleay32.lib) and 1.1.x (libcrypto.lib, libssl.lib). TLSLIBDIR cannot be used in this case. Use TLSLIB="$(TLSLIBDIR)\libeay32.lib" TLSLIB2="$(TLSLIBDIR)\ssleay32.lib" for OpenSSL 1.0.x or TLSLIB="$(TLSLIBDIR)\libcrypto.lib" TLSLIB2="$(TLSLIBDIR)\libssl.lib" for OpenSSL 1.1.x. ! ENDIF ! ENDIF -CFLAGS = $(CFLAGS) /DHAVE_OPENSSL +CFLAGS = $(CFLAGS) /DHAVE_OPENSSL /DHAVE_OPENSSL_WITH_PSK ! ENDIF ! IF !EXISTS("$(TLSLIB)") |