diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-27 21:48:43 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-27 21:48:43 +0200 |
| commit | 2533dd084403235c5f36590a1b8106761ff989b7 (patch) | |
| tree | aafba5e2b5bd293ee78c80b9836bd5e81d77eabf /config | |
| parent | 69585b215b6ca854f9a0757787242df30193946f (diff) | |
| download | mariadb-git-2533dd084403235c5f36590a1b8106761ff989b7.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
config/ac-macros/yassl.m4:
Add variable yassl_libs_with_path variable for libmysqld
configure.in:
Don't add yassl_libs to CLIENT_LIBS var since clients will be linked with libmysqlclient that includes yassl libs.
extra/yassl/src/Makefile.am:
Make a normal .a lib
extra/yassl/taocrypt/src/Makefile.am:
Make a normal .a lib
libmysql/Makefile.am:
Add yassl_libs to libmysql
libmysqld/Makefile.am:
Add yassl_libss_with_path to libmysqld
Diffstat (limited to 'config')
| -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" ]) ]) |