diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2021-09-27 10:10:38 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2021-09-27 10:10:38 +0300 |
| commit | f2859767d4218e60f8ac3adbac6123c8a1f68279 (patch) | |
| tree | 523b2f42bebe823c85c9e914d26c79120416ff3a /auto | |
| parent | 8ce1c2c7e9abc90a63ad74df5ad4cc7c37b24c87 (diff) | |
| download | nginx-f2859767d4218e60f8ac3adbac6123c8a1f68279.tar.gz nginx-f2859767d4218e60f8ac3adbac6123c8a1f68279.zip | |
Configure: fixed QUIC support test.
OpenSSL library QUIC support cannot be tested at configure time when
using the --with-openssl option so assume it's present if requested.
While here, fixed the error message in case QUIC support is missing.
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/lib/openssl/conf | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index 8b84c02a4..9ab062091 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -5,12 +5,16 @@ if [ $OPENSSL != NONE ]; then + have=NGX_OPENSSL . auto/have + have=NGX_SSL . auto/have + + if [ $USE_OPENSSL_QUIC = YES ]; then + have=NGX_QUIC . auto/have + fi + case "$CC" in cl | bcc32) - have=NGX_OPENSSL . auto/have - have=NGX_SSL . auto/have - CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" @@ -33,9 +37,6 @@ if [ $OPENSSL != NONE ]; then ;; *) - have=NGX_OPENSSL . auto/have - have=NGX_SSL . auto/have - CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" @@ -139,30 +140,28 @@ END exit 1 fi -fi - + if [ $USE_OPENSSL_QUIC = YES ]; then -if [ $USE_OPENSSL_QUIC = YES ]; then - - ngx_feature="OpenSSL QUIC support" - ngx_feature_name="NGX_QUIC" - ngx_feature_run=no - ngx_feature_incs="#include <openssl/ssl.h>" - ngx_feature_path= - ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" - ngx_feature_test="SSL_set_quic_method(NULL, NULL)" - . auto/feature + ngx_feature="OpenSSL QUIC support" + ngx_feature_name="NGX_QUIC" + ngx_feature_run=no + ngx_feature_incs="#include <openssl/ssl.h>" + ngx_feature_path= + ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" + ngx_feature_test="SSL_set_quic_method(NULL, NULL)" + . auto/feature - if [ $ngx_found = no ]; then + if [ $ngx_found = no ]; then cat << END $0: error: certain modules require OpenSSL QUIC support. -You can either do not enable the modules, or install the OpenSSL library -into the system, or build the OpenSSL library statically from the source -with nginx by using --with-openssl=<path> option. +You can either do not enable the modules, or install the OpenSSL library with +QUIC support into the system, or build the OpenSSL library with QUIC support +statically from the source with nginx by using --with-openssl=<path> option. END - exit 1 + exit 1 + fi fi fi |