Commit 393c867f authored by unknown's avatar unknown

Use --with-ssl


BUILD/compile-dist:
  Use --with-ssl instead of --with-yassl
config/ac-macros/ssl.m4:
  Change variable name to with_bundled_yassl
parent d2f5a104
...@@ -54,7 +54,7 @@ fi ...@@ -54,7 +54,7 @@ fi
--with-federated-storage-engine \ --with-federated-storage-engine \
--with-berkeley-db \ --with-berkeley-db \
--with-innodb \ --with-innodb \
--with-yassl \ --with-ssl \
--enable-thread-safe-client \ --enable-thread-safe-client \
--with-extra-charsets=complex \ --with-extra-charsets=complex \
--with-ndbcluster \ --with-ndbcluster \
......
...@@ -23,7 +23,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [ ...@@ -23,7 +23,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
extra/yassl/src/Makefile dnl extra/yassl/src/Makefile dnl
extra/yassl/testsuite/Makefile) extra/yassl/testsuite/Makefile)
with_yassl="yes" with_bundled_yassl="yes"
yassl_dir="yassl" yassl_dir="yassl"
AC_SUBST([yassl_dir]) AC_SUBST([yassl_dir])
...@@ -196,5 +196,5 @@ AC_MSG_CHECKING(for SSL) ...@@ -196,5 +196,5 @@ AC_MSG_CHECKING(for SSL)
MYSQL_FIND_OPENSSL([$mysql_ssl_dir]) MYSQL_FIND_OPENSSL([$mysql_ssl_dir])
;; ;;
esac esac
AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ]) AM_CONDITIONAL([HAVE_YASSL], [ test "$with_bundled_yassl" = "yes" ])
]) ])
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment