diff options
| author | Monty <monty@mariadb.org> | 2016-12-30 11:23:45 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-01-11 09:18:36 +0200 |
| commit | 7567cf5aef9c21b2c8dc404cfe10b4a189851163 (patch) | |
| tree | 8ae2a2b3b29570ed4675b9c88f27a7c7da57087c /cmake | |
| parent | ea1b25046c81db8fdf59130126d57cfb42737ba5 (diff) | |
| download | mariadb-git-7567cf5aef9c21b2c8dc404cfe10b4a189851163.tar.gz | |
Fixes for using ssl with BUILD scripts.
Needed as GNUTLS can't be used by MariaDB on many systems,
like OpenSuse 13.2
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/configure.pl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cmake/configure.pl b/cmake/configure.pl index 68baf436c1c..c502a172a22 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -165,21 +165,26 @@ foreach my $option (@ARGV) $cmakeargs = $cmakeargs." -DWITH_LIBEVENT=bundled"; next; } - if($option =~ /with-ssl=/) + if($option =~ /with-ssl=yes/) { $cmakeargs = $cmakeargs." -DWITH_SSL=yes"; next; } - if($option =~ /with-debug/) + if($option =~ /with-ssl=system/) { - $cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF"; + $cmakeargs = $cmakeargs." -DWITH_SSL=system"; next; } - if($option =~ /with-ssl/) + if($option =~ /with-ssl$/) { $cmakeargs = $cmakeargs." -DWITH_SSL=bundled"; next; } + if($option =~ /with-debug/) + { + $cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF"; + next; + } if($option =~ /prefix=/) { $cmake_install_prefix= substr($option, 7); |