diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-06-06 14:15:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-06-06 14:15:29 +0200 |
| commit | 38c4ef63b862fd59b4285fc3bfd9f5dff536649d (patch) | |
| tree | d3717570d38fd0c19d5bd9bb23b12134aa5a5e3a /cmake | |
| parent | b14d3adad9d10a8575bebca7e7af0ff7ef9f71b1 (diff) | |
| download | mariadb-git-38c4ef63b862fd59b4285fc3bfd9f5dff536649d.tar.gz | |
MDEV-302 lp:988204 MariaDB 5.5.23 binaries don't use libaio
simplify debian/dist/*/rules slightly.
move hard-coded config value to cmake files.
(the actual fix is -DBUILD_CONFIG=mysql_release)
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") |