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 /libmysqld | |
| 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 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index ca8e48aa612..01fbbc0f7d9 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -80,7 +80,9 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/vio/libvio.a + $(top_builddir)/vio/libvio.a \ + @yassl_libs_with_path@ + # # To make it easy for the end user to use the embedded library we |