Mercurial > hg > nginx

comparison auto/lib/openssl/conf @ 6862:abb0a4189cf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32: compatiblity with OpenSSL 1.1.0. OpenSSL 1.1.0 now uses normal "nmake; nmake install" instead of using custom "ms\do_ms.bat" script and "ms\nt.mak" makefile. And Configure now requires --prefix to be absolute, and no longer derives --openssldir from prefix (so it's specified explicitly). Generated libraries are now called "libcrypto.lib" and "libssl.lib" instead of "libeay32.lib" and "ssleay32.lib". Appropriate tests added to support both old and new variants. Additionally, openssl/lhash.h now triggers warning C4090 ('function' : different 'const' qualifiers), so the warning was disabled.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 24 Dec 2016 18:01:14 +0300
parents a57b2b8999e7
children 04ebf29eaf5b
comparison
equal deleted inserted replaced
6861:e4590dfd97ff 6862:abb0a4189cf7
13 13
14 CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" 14 CFLAGS="$CFLAGS -DNO_SYS_TYPES_H"
15 15
16 CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" 16 CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
17 CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" 17 CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
18 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" 18
19 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" 19 if [ -f $OPENSSL/ms/do_ms.bat ]; then
20 # before OpenSSL 1.1.0
21 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib"
22 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib"
23 else
24 # OpenSSL 1.1.0+
25 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib"
26 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib"
27 fi
20 28
21 # libeay32.lib requires gdi32.lib 29 # libeay32.lib requires gdi32.lib
22 CORE_LIBS="$CORE_LIBS gdi32.lib" 30 CORE_LIBS="$CORE_LIBS gdi32.lib"
23 # OpenSSL 1.0.0 requires crypt32.lib 31 # OpenSSL 1.0.0 requires crypt32.lib
24 CORE_LIBS="$CORE_LIBS crypt32.lib" 32 CORE_LIBS="$CORE_LIBS crypt32.lib"