From 38c4ef63b862fd59b4285fc3bfd9f5dff536649d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 6 Jun 2012 14:15:29 +0200 Subject: 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) --- cmake/build_configurations/mysql_release.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'cmake') 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") -- cgit v1.2.1