mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
f63046319b
The problem was that the bundled yaSSL library was being built without thread safety support regardless of the thread safeness of the compoments linked with it. The solution is to enable yaSSL thread safety support if any component (server or client) is to be built with thread support. Also, generate new certificates for yaSSL's test suite.
51 lines
1.8 KiB
Text
51 lines
1.8 KiB
Text
AC_CONFIG_FILES(extra/yassl/Makefile dnl
|
|
extra/yassl/taocrypt/Makefile dnl
|
|
extra/yassl/taocrypt/src/Makefile dnl
|
|
extra/yassl/src/Makefile dnl
|
|
extra/yassl/testsuite/Makefile dnl
|
|
extra/yassl/taocrypt/test/Makefile dnl
|
|
extra/yassl/taocrypt/benchmark/Makefile)
|
|
|
|
AC_DEFUN([MYSQL_CHECK_YASSL], [
|
|
AC_MSG_CHECKING(for yaSSL)
|
|
AC_ARG_WITH([yassl], [ --with-yassl Include the yaSSL support],,)
|
|
|
|
if test "$with_yassl" = "yes"
|
|
then
|
|
if test "$openssl" != "no"
|
|
then
|
|
AC_MSG_ERROR([Cannot configure MySQL to use yaSSL and OpenSSL simultaneously.])
|
|
fi
|
|
AC_MSG_RESULT([using bundled yaSSL])
|
|
yassl_dir="extra/yassl"
|
|
yassl_libs="\$(top_builddir)/extra/yassl/src/libyassl.la \
|
|
\$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la"
|
|
AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
|
|
AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
|
|
# System specific checks
|
|
yassl_integer_extra_cxxflags=""
|
|
case $host_cpu--$CXX_VERSION in
|
|
sparc*--*Sun*C++*5.6*)
|
|
# Disable inlining when compiling taocrypt/src/
|
|
yassl_taocrypt_extra_cxxflags="+d"
|
|
AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/])
|
|
;;
|
|
esac
|
|
AC_SUBST([yassl_taocrypt_extra_cxxflags])
|
|
# Thread safe check
|
|
yassl_thread_cxxflags=""
|
|
if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"; then
|
|
yassl_thread_cxxflags="-DYASSL_THREAD_SAFE"
|
|
fi
|
|
AC_SUBST([yassl_thread_cxxflags])
|
|
# Link extra/yassl/include/openssl subdir to include/
|
|
yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl"
|
|
AC_SUBST(yassl_h_ln_cmd)
|
|
else
|
|
yassl_dir=""
|
|
AC_MSG_RESULT(no)
|
|
fi
|
|
AC_SUBST(yassl_libs)
|
|
AC_SUBST(yassl_dir)
|
|
AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ])
|
|
])
|