diff options
| author | msvensson@neptunus.(none) <> | 2005-10-27 21:48:43 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-10-27 21:48:43 +0200 |
| commit | bb571de36845ebabfb1880ab823b346b54362fe3 (patch) | |
| tree | aafba5e2b5bd293ee78c80b9836bd5e81d77eabf /config/ac-macros/yassl.m4 | |
| parent | 0684dc1342e0e0bbf20224e159fb4b457b598f0c (diff) | |
| download | mariadb-git-bb571de36845ebabfb1880ab823b346b54362fe3.tar.gz | |
BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking
- Remove yassl_libsfrom CLIENT_LIBS var
- Add yassl_libs to libmysql and libmysqld
Diffstat (limited to 'config/ac-macros/yassl.m4')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 548768fb717..ac955155996 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -16,6 +16,7 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_RESULT([using bundled yaSSL]) yassl_dir="extra/yassl" yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt" + yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.a \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.a" yassl_includes="-I\$(top_srcdir)/extra/yassl/include" AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) else @@ -25,5 +26,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_SUBST(yassl_libs) AC_SUBST(yassl_includes) AC_SUBST(yassl_dir) + AC_SUBST(yassl_libs_with_path) AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) ]) |