diff options
author | unknown <svoj@mysql.com> | 2005-04-28 18:23:27 +0500 |
---|---|---|
committer | unknown <svoj@mysql.com> | 2005-04-28 18:23:27 +0500 |
commit | e28bf9ef5e6a4240755349a73094bc43806faa9f (patch) | |
tree | faf48fd8da1c6b1e9b69a5e89ebff26bb440b34b /config | |
parent | b790a34805664e43c37d2b064722ff3ee7d79ad7 (diff) | |
download | mariadb-git-e28bf9ef5e6a4240755349a73094bc43806faa9f.tar.gz |
WL#2286 Compile MySQL w/YASSL support
yaSSL-0.9.7 library bundled.
BUILD/Makefile.am:
compile-pentium-debug-yassl added to distribution.
Makefile.am:
Added yassl_dir to SUBDIRS. It contains path to yassl distribution if --with-yassl
specified. It is empty otherwise.
configure.in:
yaSSL CHECK-function call.
extra/Makefile.am:
yaSSL added to distribution.
include/violite.h:
YASSL_MYSQL_COMPATIBLE macro must be defined to make yassl headers compatible.
Diffstat (limited to 'config')
-rw-r--r-- | config/ac-macros/yassl.m4 | 33 |
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) +]) |