diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-12-29 19:37:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-12-29 19:37:11 +0400 |
| commit | 2ba7ed77aab05004f0c853a77850e325b78a1892 (patch) | |
| tree | 943659d76215e16d0d1946c28683c562debeff34 /cmake/ssl.cmake | |
| parent | 63f0669fd6dc430b60ffd5de0bff9854622a1c1a (diff) | |
| parent | 1bb66ea88c4679d6bd3ad1472d75983e66f679ae (diff) | |
| download | mariadb-git-2ba7ed77aab05004f0c853a77850e325b78a1892.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'cmake/ssl.cmake')
| -rw-r--r-- | cmake/ssl.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 97fafc703d5..0173cf026f1 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -55,6 +55,7 @@ MACRO (MYSQL_USE_BUNDLED_SSL) SET(SSL_INCLUDE_DIRS ${INC_DIRS}) SET(SSL_INTERNAL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL) SET(SSL_DEFINES "-DHAVE_YASSL -DYASSL_PREFIX -DHAVE_OPENSSL -DMULTI_THREADED") + SET(HAVE_ERR_remove_thread_state OFF CACHE INTERNAL "yassl doesn't have ERR_remove_thread_state") SET(HAVE_EncryptAes128Ctr OFF CACHE INTERNAL "yassl doesn't support AES-CTR") SET(HAVE_EncryptAes128Gcm OFF CACHE INTERNAL "yassl doesn't support AES-GCM") CHANGE_SSL_SETTINGS("bundled") @@ -197,6 +198,8 @@ MACRO (MYSQL_CHECK_SSL) SET(SSL_DEFINES "-DHAVE_OPENSSL") SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES}) + CHECK_SYMBOL_EXISTS(ERR_remove_thread_state "openssl/err.h" + HAVE_ERR_remove_thread_state) CHECK_SYMBOL_EXISTS(EVP_aes_128_ctr "openssl/evp.h" HAVE_EncryptAes128Ctr) CHECK_SYMBOL_EXISTS(EVP_aes_128_gcm "openssl/evp.h" |