diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-08 18:14:18 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-08 18:14:18 -0300 |
| commit | 75a18e24fa72cca07254cbabd119b944c0ef989d (patch) | |
| tree | 0699584297a9aa3c81ff88503dfb377f2d99610f /config | |
| parent | e484e89d3df80e5a67f3eeac71e7c5ec1b081513 (diff) | |
| parent | 51e90dc79e5b3847a8b1fdf69b8207864ff2f7c8 (diff) | |
| download | mariadb-git-75a18e24fa72cca07254cbabd119b944c0ef989d.tar.gz | |
Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
config/ac-macros/ssl.m4:
Enable yaSSL thread safety if linking with the server or a
thread safe client library. Avoids building a thread safe
yaSSL when only building a non-thread safe client library.
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ssl.m4 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/config/ac-macros/ssl.m4 b/config/ac-macros/ssl.m4 index 729115ffe88..fc55f93d8d6 100644 --- a/config/ac-macros/ssl.m4 +++ b/config/ac-macros/ssl.m4 @@ -38,11 +38,20 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [ esac AC_SUBST([yassl_taocrypt_extra_cxxflags]) + # Thread safe check + yassl_thread_cxxflags="" + yassl_thread_safe="" + if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"; then + yassl_thread_cxxflags="-DYASSL_THREAD_SAFE" + yassl_thread_safe="(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) - AC_MSG_RESULT([using bundled yaSSL]) + AC_MSG_RESULT([using bundled yaSSL $yassl_thread_safe]) ]) |