mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
e03f47859f
- Include prefix files that renames all public functions in yaSSLs OpenSSL API to ya<function_name>. They will otherwise conflict with OpenSSL functions if loaded by an application that uses OpenSSL as well as libmysqlclient with yaSSL support. client/Makefile.am: Remove $yassl_includes ...and one "suspicious line" config/ac-macros/yassl.m4: Remove yassl_includes as they are the same as "normal" include extra/yassl/include/openssl/crypto.h: Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_* extra/yassl/include/openssl/ssl.h: Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_* libmysql/Makefile.am: Remove yassl_includes libmysql_r/Makefile.am: Remove yassl_includes libmysqld/Makefile.am: Remove yassl_includes And one suspicious line libmysqld/examples/Makefile.am: Remove yassl_includes server-tools/instance-manager/Makefile.am: Remove yassl_includes sql/Makefile.am: Remove yassl_includes tools/Makefile.am: Add link with yaSSL libs vio/Makefile.am: Remove yassl_includes extra/yassl/include/openssl/generate_prefix_files.pl: Add utility script to parse the header files to generate the prefix_* files that renames yaSSL SSL_* functions extra/yassl/include/openssl/prefix_crypto.h: Add prefix file for crypto.h extra/yassl/include/openssl/prefix_ssl.h: Add prefix file for ssl.h
44 lines
1.6 KiB
Text
44 lines
1.6 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="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"
|
|
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])
|
|
# 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" ])
|
|
])
|