From 7567cf5aef9c21b2c8dc404cfe10b4a189851163 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Fri, 30 Dec 2016 11:23:45 +0200
Subject: Fixes for using ssl with BUILD scripts.

Needed as GNUTLS can't be used by MariaDB on many systems,
like OpenSuse 13.2
---
 cmake/configure.pl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'cmake/configure.pl')

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);
-- 
cgit v1.2.1