revision-id: cee6548379ec8a58f4a9e17224bcb6ae6b2a983a (mariadb-10.1.38-7-gcee6548379e) parent(s): 346e46089621e6951e076c82ed5690aa23dcb5fe author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-02-19 12:38:51 +0100 message: Don't build aws_key_management plugin by default --- CMakeLists.txt | 2 +- cmake/readline.cmake | 2 +- configure.cmake | 2 +- plugin/aws_key_management/CMakeLists.txt | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef8786aff12..358f73ccfdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -500,5 +500,5 @@ ENDIF() IF(NON_DISTRIBUTABLE_WARNING) MESSAGE(WARNING " -You have linked MariaDB with GPLv3 libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with Free Software Foundation.") +You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.") ENDIF() diff --git a/cmake/readline.cmake b/cmake/readline.cmake index d03fe503882..9cfbe4f0d55 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -157,7 +157,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE) SET(USE_NEW_READLINE_INTERFACE 1) ELSE() IF(NOT_FOR_DISTRIBUTION) - SET(NON_DISTRIBUTABLE_WARNING 1) + SET(NON_DISTRIBUTABLE_WARNING "GPLv3") SET(USE_NEW_READLINE_INTERFACE 1) ELSE() SET(USE_NEW_READLINE_INTERFACE 0) diff --git a/configure.cmake b/configure.cmake index d37dccbea4a..38165e5b444 100644 --- a/configure.cmake +++ b/configure.cmake @@ -258,7 +258,7 @@ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DPACKAGE=test) # b CHECK_INCLUDE_FILES (bfd.h BFD_H_EXISTS) IF(BFD_H_EXISTS) IF(NOT_FOR_DISTRIBUTION) - SET(NON_DISTRIBUTABLE_WARNING 1) + SET(NON_DISTRIBUTABLE_WARNING "GPLv3") SET(HAVE_BFD_H 1) ENDIF() ENDIF() diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt index 9221b54ef7e..49f6b54a24c 100644 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@ -22,11 +22,17 @@ MACRO(SKIP_AWS_PLUGIN msg) ENDMACRO() SET(CMAKE_CXX_STANDARD 11) +IF(NOT NOT_FOR_DISTRIBUTION) + SKIP_AWS_PLUGIN("AWS SDK has Apache 2.0 License which is not complatible with GPLv2. Set -DNOT_FOR_DISTRIBUTION=ON if you need this plugin") +ENDIF() + MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc DISABLED COMPONENT aws-key-management) IF(NOT TARGET aws_key_management) RETURN() +ELSE() + SET(NON_DISTRIBUTABLE_WARNING "Apache 2.0" PARENT_SCOPE) ENDIF() # This plugin needs recent C++ compilers (AWS C++ SDK header files are using C++11 features)