diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-04-20 20:51:26 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-04-20 20:51:26 +0400 |
| commit | 63fb05225fdf451bf12450316164cd2b3ec560d7 (patch) | |
| tree | c0060da3f447e8e30eb332ccaa819851da12206d /cmake | |
| parent | a6a4fa1d6f00c2872cc6fd4ff103b7c4a5a9db8d (diff) | |
| parent | 55e99a6b3e47275d5d412c78da37705f095ba61f (diff) | |
| download | mariadb-git-63fb05225fdf451bf12450316164cd2b3ec560d7.tar.gz | |
Merging from maria-10.0-connect (DEB packaging related fixes)
added:
debian/mariadb-connect-engine-10.0.files
modified:
cmake/build_configurations/mysql_release.cmake
debian/dist/Debian/control
debian/dist/Debian/mariadb-server-10.0.files
debian/dist/Ubuntu/control
debian/dist/Ubuntu/mariadb-server-10.0.files
pending merges:
Alexander Barkov 2013-04-20 Adding mariadb-connect-engine-10.0 deb packa...
Alexander Barkov 2013-04-19 Removing the connect engine from mariadb...
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index a8097f03824..fec266d8f3b 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -103,7 +103,12 @@ ELSEIF(DEB) SET(WITH_SSL system CACHE STRING "") SET(WITH_ZLIB system CACHE STRING "") SET(WITH_LIBWRAP ON) - SET(WITH_MAX ON) + # Note, CONNECT engine should not be compiled statically + # because it requires unixODBC and libxml2 as dependencies + SET(WITH_ARCHIVE 1) + SET(WITH_BLACKHOLE 1) + SET(WITH_FEDERATEDX 1) + SET(WITH_SPHINX 1) SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON) ELSE() SET(WITH_SSL bundled CACHE STRING "") |