Commit 8772824c authored by Sergei Golubchik's avatar Sergei Golubchik

Restore auto-switch to bundled ssl if WITH_SSL=yes

if -DWITH_SSL=yes and system ssl cannot be used,
bundled ssl should be auto-selected.

That's how it worked in 10.0, and it was unintentionally broken in 10.1.
parent d5f564a9
...@@ -180,8 +180,7 @@ MACRO (MYSQL_CHECK_SSL) ...@@ -180,8 +180,7 @@ MACRO (MYSQL_CHECK_SSL)
OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
) )
MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}") MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}")
ENDIF()
IF(TRUE) #OPENSSL_MAJOR_VERSION GREATER 0)
SET(SSL_SOURCES "") SET(SSL_SOURCES "")
SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY}) SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY})
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment