Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge with trunk |
|---|---|
| Timelines: | family | ancestors | descendants | both | wtf-8-experiment |
| Files: | files | file ages | folders |
| SHA1: |
d5b63210457b34bba77e52de8e3fdc17 |
| User & Date: | chw 2020-05-21 06:05:19.778 |
Context
|
2020-05-23
| ||
| 08:55 | merge with trunk check-in: 4dfcc43c2c user: chw tags: wtf-8-experiment | |
|
2020-05-21
| ||
| 06:05 | merge with trunk check-in: d5b6321045 user: chw tags: wtf-8-experiment | |
| 06:03 | fix tls build on haiku with openssl 1.1 check-in: 9e36db2545 user: chw tags: trunk | |
| 06:01 | merge with trunk check-in: 1663fd9a31 user: chw tags: wtf-8-experiment | |
Changes
Changes to jni/tls/aclocal.m4.
| ︙ | ︙ | |||
83 84 85 86 87 88 89 |
#--------------------------------------------------------------------
# The OpenSSL and BSAFE SSL-C directory structures differ.
#--------------------------------------------------------------------
if test -n "${OPENSSL}"; then
SSL_LIB_DIR=${SSL_DIR}/lib
| > > | | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 |
#--------------------------------------------------------------------
# The OpenSSL and BSAFE SSL-C directory structures differ.
#--------------------------------------------------------------------
if test -n "${OPENSSL}"; then
SSL_LIB_DIR=${SSL_DIR}/lib
if test -f "${SSL_DIR}/headers/x86/openssl/opensslv.h" ; then
SSL_INCLUDE_DIR=${SSL_DIR}/headers/x86
elif test -f "${SSL_DIR}/headers/openssl/opensslv.h" ; then
SSL_INCLUDE_DIR=${SSL_DIR}/headers
else
SSL_INCLUDE_DIR=${SSL_DIR}/include
if test ! -f "${SSL_INCLUDE_DIR}/openssl/opensslv.h"; then
AC_ERROR([bad ssl-dir: cannot find openssl/opensslv.h under ${SSL_INCLUDE_DIR}])
fi
fi
|
| ︙ | ︙ |
Changes to jni/tls/configure.
| ︙ | ︙ | |||
11996 11997 11998 11999 12000 12001 12002 |
#--------------------------------------------------------------------
# The OpenSSL and BSAFE SSL-C directory structures differ.
#--------------------------------------------------------------------
if test -n "${OPENSSL}"; then
SSL_LIB_DIR=${SSL_DIR}/lib
| > > | | 11996 11997 11998 11999 12000 12001 12002 12003 12004 12005 12006 12007 12008 12009 12010 12011 12012 |
#--------------------------------------------------------------------
# The OpenSSL and BSAFE SSL-C directory structures differ.
#--------------------------------------------------------------------
if test -n "${OPENSSL}"; then
SSL_LIB_DIR=${SSL_DIR}/lib
if test -f "${SSL_DIR}/headers/x86/openssl/opensslv.h" ; then
SSL_INCLUDE_DIR=${SSL_DIR}/headers/x86
elif test -f "${SSL_DIR}/headers/openssl/opensslv.h" ; then
SSL_INCLUDE_DIR=${SSL_DIR}/headers
else
SSL_INCLUDE_DIR=${SSL_DIR}/include
if test ! -f "${SSL_INCLUDE_DIR}/openssl/opensslv.h"; then
{ { $as_echo "$as_me:$LINENO: error: bad ssl-dir: cannot find openssl/opensslv.h under ${SSL_INCLUDE_DIR}" >&5
$as_echo "$as_me: error: bad ssl-dir: cannot find openssl/opensslv.h under ${SSL_INCLUDE_DIR}" >&2;}
{ (exit 1); exit 1; }; }
|
| ︙ | ︙ |