Mercurial > hg > nginx
comparison auto/lib/openssl/conf @ 7246:04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
OpenSSL now uses pthread_atfork(), and this requires -lpthread on Linux
to compile. Introduced NGX_LIBPTHREAD to add it as appropriate, similar
to existing NGX_LIBDL.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 22 Mar 2018 15:55:57 +0300 |
parents | abb0a4189cf7 |
children | 7999d3fbb765 |
comparison
equal
deleted
inserted
replaced
7245:3f1c5ff0d7fb | 7246:04ebf29eaf5b |
---|---|
39 CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" | 39 CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" |
40 CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" | 40 CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" |
41 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" | 41 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" |
42 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" | 42 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" |
43 CORE_LIBS="$CORE_LIBS $NGX_LIBDL" | 43 CORE_LIBS="$CORE_LIBS $NGX_LIBDL" |
44 CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" | |
44 | 45 |
45 if [ "$NGX_PLATFORM" = win32 ]; then | 46 if [ "$NGX_PLATFORM" = win32 ]; then |
46 CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" | 47 CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" |
47 fi | 48 fi |
48 ;; | 49 ;; |
57 ngx_feature="OpenSSL library" | 58 ngx_feature="OpenSSL library" |
58 ngx_feature_name="NGX_OPENSSL" | 59 ngx_feature_name="NGX_OPENSSL" |
59 ngx_feature_run=no | 60 ngx_feature_run=no |
60 ngx_feature_incs="#include <openssl/ssl.h>" | 61 ngx_feature_incs="#include <openssl/ssl.h>" |
61 ngx_feature_path= | 62 ngx_feature_path= |
62 ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL" | 63 ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" |
63 ngx_feature_test="SSL_CTX_set_options(NULL, 0)" | 64 ngx_feature_test="SSL_CTX_set_options(NULL, 0)" |
64 . auto/feature | 65 . auto/feature |
65 | 66 |
66 if [ $ngx_found = no ]; then | 67 if [ $ngx_found = no ]; then |
67 | 68 |
69 | 70 |
70 ngx_feature="OpenSSL library in /usr/local/" | 71 ngx_feature="OpenSSL library in /usr/local/" |
71 ngx_feature_path="/usr/local/include" | 72 ngx_feature_path="/usr/local/include" |
72 | 73 |
73 if [ $NGX_RPATH = YES ]; then | 74 if [ $NGX_RPATH = YES ]; then |
74 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto $NGX_LIBDL" | 75 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" |
75 else | 76 else |
76 ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto $NGX_LIBDL" | 77 ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" |
77 fi | 78 fi |
79 | |
80 ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" | |
78 | 81 |
79 . auto/feature | 82 . auto/feature |
80 fi | 83 fi |
81 | 84 |
82 if [ $ngx_found = no ]; then | 85 if [ $ngx_found = no ]; then |
85 | 88 |
86 ngx_feature="OpenSSL library in /usr/pkg/" | 89 ngx_feature="OpenSSL library in /usr/pkg/" |
87 ngx_feature_path="/usr/pkg/include" | 90 ngx_feature_path="/usr/pkg/include" |
88 | 91 |
89 if [ $NGX_RPATH = YES ]; then | 92 if [ $NGX_RPATH = YES ]; then |
90 ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL" | 93 ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" |
91 else | 94 else |
92 ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL" | 95 ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" |
93 fi | 96 fi |
97 | |
98 ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" | |
94 | 99 |
95 . auto/feature | 100 . auto/feature |
96 fi | 101 fi |
97 | 102 |
98 if [ $ngx_found = no ]; then | 103 if [ $ngx_found = no ]; then |
101 | 106 |
102 ngx_feature="OpenSSL library in /opt/local/" | 107 ngx_feature="OpenSSL library in /opt/local/" |
103 ngx_feature_path="/opt/local/include" | 108 ngx_feature_path="/opt/local/include" |
104 | 109 |
105 if [ $NGX_RPATH = YES ]; then | 110 if [ $NGX_RPATH = YES ]; then |
106 ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto $NGX_LIBDL" | 111 ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" |
107 else | 112 else |
108 ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto $NGX_LIBDL" | 113 ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" |
109 fi | 114 fi |
115 | |
116 ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" | |
110 | 117 |
111 . auto/feature | 118 . auto/feature |
112 fi | 119 fi |
113 | 120 |
114 if [ $ngx_found = yes ]; then | 121 if [ $ngx_found = yes ]; then |