diff options
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/make | 2 | ||||
| -rw-r--r-- | auto/options | 3 | ||||
| -rw-r--r-- | auto/sources | 10 | ||||
| -rw-r--r-- | auto/ssltls | 8 |
4 files changed, 11 insertions, 12 deletions
@@ -149,7 +149,7 @@ $NXT_BUILD_DIR/utf8_file_name_test: $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\ -o $NXT_BUILD_DIR/utf8_file_name_test \\ $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\ $NXT_BUILD_DIR/$NXT_LIB_STATIC \\ - $NXT_LD_OPT $NXT_LIBM $NXT_LIBS + $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS $NXT_BUILD_DIR/unit_app_test: $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\ $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC diff --git a/auto/options b/auto/options index 9563bbc8..eadfb198 100644 --- a/auto/options +++ b/auto/options @@ -19,7 +19,7 @@ NXT_UNIX_DOMAIN=YES NXT_REGEX=NO NXT_PCRE=NO -NXT_SSLTLS=NO +NXT_TLS=NO NXT_OPENSSL=NO NXT_GNUTLS=NO NXT_CYASSL=NO @@ -72,7 +72,6 @@ do --pcre) NXT_PCRE=YES ;; - --ssltls) NXT_SSLTLS=YES ;; --openssl) NXT_OPENSSL=YES ;; --gnutls) NXT_GNUTLS=YES ;; --cyassl) NXT_CYASSL=YES ;; diff --git a/auto/sources b/auto/sources index 6f3c823e..f57a264d 100644 --- a/auto/sources +++ b/auto/sources @@ -105,8 +105,8 @@ NXT_LIB_SRC0=" \ NXT_LIB_UNIT_SRCS="src/nxt_unit.c" -NXT_LIB_SSLTLS_DEPS="src/nxt_ssltls.h" -NXT_LIB_SSLTLS_SRCS="src/nxt_ssltls.c" +NXT_LIB_TLS_DEPS="src/nxt_tls.h" +NXT_LIB_TLS_SRCS= NXT_LIB_OPENSSL_SRCS="src/nxt_openssl.c" NXT_LIB_GNUTLS_SRCS="src/nxt_gnutls.c" NXT_LIB_CYASSL_SRCS="src/nxt_cyassl.c" @@ -157,9 +157,9 @@ NXT_LIB_UTF8_FILE_NAME_TEST_SRCS=" \ " -if [ $NXT_SSLTLS = YES ]; then - nxt_have=NXT_SSLTLS . auto/have - NXT_LIB_SRCS="$NXT_LIB_SRCS $NXT_LIB_SSLTLS_SRCS" +if [ $NXT_TLS = YES ]; then + nxt_have=NXT_TLS . auto/have + NXT_LIB_SRCS="$NXT_LIB_SRCS $NXT_LIB_TLS_SRCS" fi diff --git a/auto/ssltls b/auto/ssltls index 63b67fdb..f034b758 100644 --- a/auto/ssltls +++ b/auto/ssltls @@ -31,7 +31,7 @@ if [ $NXT_OPENSSL = YES ]; then if [ $nxt_found = yes ]; then - NXT_SSLTLS=YES + NXT_TLS=YES NXT_OPENSSL_LIBS="$nxt_feature_libs" nxt_feature="OpenSSL version" @@ -78,7 +78,7 @@ if [ $NXT_GNUTLS = YES ]; then if [ $nxt_found = yes ]; then - NXT_SSLTLS=YES + NXT_TLS=YES $echo " + GnuTLS version: `pkg-config gnutls --modversion`" @@ -138,7 +138,7 @@ if [ $NXT_CYASSL = YES ]; then if [ $nxt_found = yes ]; then - NXT_SSLTLS=YES + NXT_TLS=YES NXT_CYASSL_CFLAGS="$nxt_feature_incs" NXT_CYASSL_LIBS="$nxt_feature_libs" @@ -171,7 +171,7 @@ if [ $NXT_POLARSSL = YES ]; then if [ $nxt_found = yes ]; then - NXT_SSLTLS=YES + NXT_TLS=YES NXT_POLARSSL_CFLAGS="$nxt_feature_incs" NXT_POLARSSL_LIBS="$nxt_feature_libs" |