diff options
| author | unknown <svoj@mysql.com> | 2005-06-03 00:28:18 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-06-03 00:28:18 +0500 |
| commit | bdbace6666f82a12d00297fcb82802f2612899b1 (patch) | |
| tree | 054911ae2a79819c88f56811117a32d60f23b6fd /config | |
| parent | fec4347fb33d94a216c9a17b0fd37be7c9b157e8 (diff) | |
| download | mariadb-git-bdbace6666f82a12d00297fcb82802f2612899b1.tar.gz | |
WL#2286 - Compile MySQL w/YASSL support
Compilation errors fixes.
config/ac-macros/yassl.m4:
Switch to -l/-L instead of passing file name directly. (more portable for ".a" archives)
extra/yassl/taocrypt/src/integer.cpp:
Instantiate more templates (needed by some 64bit boxes).
extra/yassl/taocrypt/src/template_instnt.cpp:
Instantiate more templates (needed by some 64bit boxes).
Move tcArrayDelete to TaoCrypt namespace (more portable).
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index ada1a2c0bd1..ddacde51c2a 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -19,8 +19,8 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 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" + -L\$(top_builddir)/extra/yassl/src -lyassl\ + -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt" openssl_includes="-I\$(top_srcdir)/extra/yassl/include" AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) else |