Merge

configure.in:
  SCCS merged

1 files changed, 33 insertions, 0 deletions

diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4
new file mode 100644
index 00000000000..ada1a2c0bd1
--- /dev/null
+++ b/config/ac-macros/yassl.m4
@@ -0,0 +1,33 @@
+AC_CONFIG_FILES(extra/yassl/Makefile dnl
+extra/yassl/taocrypt/Makefile dnl
+extra/yassl/taocrypt/src/Makefile dnl
+extra/yassl/src/Makefile)
+
+AC_DEFUN([MYSQL_CHECK_YASSL], [
+  AC_MSG_CHECKING(for yaSSL)
+  AC_ARG_WITH([yassl],
+              [  --with-yassl          Include the yaSSL support],
+              [yassl=yes],
+              [yassl=no])
+
+  if test "$yassl" = "yes"
+  then
+    if test "$openssl" != "no"
+    then
+      AC_MSG_ERROR([Cannot configure MySQL to use yaSSL and OpenSSL simultaneously.])
+    fi
+    AC_MSG_RESULT([using bundled yaSSL])
+    yassl_dir="extra/yassl"
+    openssl_libs="\
+    \$(top_builddir)/extra/yassl/src/libyassl.a\
+    \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.a"
+    openssl_includes="-I\$(top_srcdir)/extra/yassl/include"
+    AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
+  else
+    yassl_dir=""
+    AC_MSG_RESULT(no)
+  fi
+  AC_SUBST(openssl_libs)
+  AC_SUBST(openssl_includes)
+  AC_SUBST(yassl_dir)
+])