summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-12-30 11:23:45 +0200
committerMonty <monty@mariadb.org>2017-01-11 09:18:36 +0200
commit7567cf5aef9c21b2c8dc404cfe10b4a189851163 (patch)
tree8ae2a2b3b29570ed4675b9c88f27a7c7da57087c /BUILD
parentea1b25046c81db8fdf59130126d57cfb42737ba5 (diff)
downloadmariadb-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 'BUILD')
-rwxr-xr-xBUILD/SETUP.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 5f5b0250088..d25b9d9d891 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -120,10 +120,9 @@ path=`dirname $0`
get_make_parallel_flag
# SSL library to use.--with-ssl will select our bundled yaSSL
-# implementation of SSL. To use OpenSSL you will need to specify
-# the location of OpenSSL headers and libs on your system.
-# Ex --with-ssl=/usr
-SSL_LIBRARY=--with-ssl
+# implementation of SSL. --with-ssl=yes will first try system library
+# then the boundled one --with-ssl=system will use the system library.
+SSL_LIBRARY=--with-ssl=system
if [ "x$warning_mode" = "xpedantic" ]; then
warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"