diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-06-27 17:22:23 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-06-27 17:22:23 +0300 |
| commit | aa67a198e8a29f2fdae84846cc1d8e74c2d47a83 (patch) | |
| tree | 47719240f2509a3fa373f54852b54d552ac6e844 /cmake | |
| parent | 9ebda8764d2e94096924c0a0181f5773d836114a (diff) | |
| parent | 072097174c8b91299fe74a3cd7c5248e6e3cfc57 (diff) | |
| download | mariadb-git-aa67a198e8a29f2fdae84846cc1d8e74c2d47a83.tar.gz | |
automatic merge with 5.5
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 87fe47cac12..5b2596491ad 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -94,8 +94,19 @@ IF(FEATURE_SET) ENDIF() OPTION(ENABLED_LOCAL_INFILE "" ON) -SET(WITH_SSL bundled CACHE STRING "") -SET(WITH_ZLIB bundled CACHE STRING "") +IF(RPM) + SET(WITH_SSL system CACHE STRING "") + SET(WITH_ZLIB system CACHE STRING "") +ELSEIF(DEB) + SET(WITH_SSL system CACHE STRING "") + SET(WITH_ZLIB system CACHE STRING "") + SET(WITH_LIBWRAP ON) + SET(WITH_MAX ON) + SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON) +ELSE() + SET(WITH_SSL bundled CACHE STRING "") + SET(WITH_ZLIB bundled CACHE STRING "") +ENDIF() IF(NOT COMPILATION_COMMENT) SET(COMPILATION_COMMENT "MariaDB Server") |