Overview
| Comment: | Updated to define the target of the build |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | feature-multibackend |
| Files: | files | file ages | folders |
| SHA1: |
e9c8a6c1b6b5f65d1e133d670a3c52df |
| User & Date: | rkeene on 2016-12-10 04:52:29 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-12-10
| ||
| 05:17 | Merged in changes from trunk check-in: d60f868f2c user: rkeene tags: feature-multibackend | |
| 04:52 | Updated to define the target of the build check-in: e9c8a6c1b6 user: rkeene tags: feature-multibackend | |
| 04:42 | Renamed TLS BIO driver to indicate its OpenSSL-specific-ness check-in: bd4aba3487 user: rkeene tags: feature-multibackend | |
Changes
Modified Makefile.in
from [10c12d5576]
to [4f5ba5c679].
| ︙ | ︙ | |||
10 11 12 13 14 15 16 | TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tcltls$(PACKAGE_VERSION) VPATH = @srcdir@ all: @EXTENSION_TARGET@ # The shared object target | | | | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tcltls$(PACKAGE_VERSION) VPATH = @srcdir@ all: @EXTENSION_TARGET@ # The shared object target tcltls.@SHOBJEXT@: tls.o tls_@TCLTLS_SSL_LIB@_bio.o tlsIO.o tlsX509.o Makefile $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o tcltls.@SHOBJEXT@ tls.o tls_@TCLTLS_SSL_LIB@_bio.o tlsIO.o tlsX509.o $(LIBS) # The static target tcltls.@AREXT@: tls.o tls_@TCLTLS_SSL_LIB@_bio.o tlsIO.o tlsX509.o Makefile $(AR) rcu tcltls.a.new tls.o tls_@TCLTLS_SSL_LIB@_bio.o tlsIO.o tlsX509.o $(RANLIB) tcltls.a.new mv tcltls.a.new tcltls.a # Dependencies for all our targets tls.o: @srcdir@/tls.c @srcdir@/tlsInt.h @srcdir@/tclOpts.h @srcdir@/tls.tcl.h dh_params.h Makefile tls_openssl_bio.o: @srcdir@/tls_openssl_bio.c @srcdir@/tlsInt.h Makefile tlsIO.o: @srcdir@/tlsIO.c @srcdir@/tlsInt.h Makefile |
| ︙ | ︙ |
Modified configure.in
from [1947c51db2]
to [2d2058ffa0].
| ︙ | ︙ | |||
127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | dnl XXX:TODO: Automatically determine the SSL library to use dnl defaulting to OpenSSL for compatibility reasons if test "$tcltls_ssl_lib" = 'auto'; then tcltls_ssl_lib='openssl' fi AC_MSG_CHECKING([which TLS library to use]) AC_MSG_RESULT([$tcltls_ssl_lib]) dnl Manually rewrite libressl to OpenSSL since we use the dnl compatibility interface if test "$tcltls_ssl_lib" = "libressl"; then tcltls_ssl_lib='openssl' fi AS_CASE([$tcltls_ssl_lib], [openssl], [ TCLTLS_SSL_OPENSSL ], [nss], [ TCLTLS_SSL_LIBS="" TCLTLS_SSL_CFLAGS="" TCLTLS_SSL_CPPFLAGS="" ], [ | > > > | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 |
dnl XXX:TODO: Automatically determine the SSL library to use
dnl defaulting to OpenSSL for compatibility reasons
if test "$tcltls_ssl_lib" = 'auto'; then
tcltls_ssl_lib='openssl'
fi
AC_MSG_CHECKING([which TLS library to use])
TCLTLS_SSL_LIB="${tcltls_ssl_lib}"
AC_SUBST(TCLTLS_SSL_LIB)
AC_MSG_RESULT([$tcltls_ssl_lib])
dnl Manually rewrite libressl to OpenSSL since we use the
dnl compatibility interface
if test "$tcltls_ssl_lib" = "libressl"; then
tcltls_ssl_lib='openssl'
fi
AS_CASE([$tcltls_ssl_lib],
[openssl], [
TCLTLS_SSL_OPENSSL
AC_DEFINE([TCLTLS_SSL_OPENSSL], [1], [Define if the backend being used is OpenSSL (or the LibreSSL OpenSSL compatibility interface)])
],
[nss], [
TCLTLS_SSL_LIBS=""
TCLTLS_SSL_CFLAGS=""
TCLTLS_SSL_CPPFLAGS=""
],
[
|
| ︙ | ︙ |