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 /extra | |
| 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 'extra')
| -rw-r--r-- | extra/yassl/src/Makefile.am | 4 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am index 83397e24168..4ebb9a2d862 100644 --- a/extra/yassl/src/Makefile.am +++ b/extra/yassl/src/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I../include -I../taocrypt/include -I../mySTL -noinst_LTLIBRARIES = libyassl.la -libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ +noinst_LIBRARIES = libyassl.a +libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \ template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp EXTRA_DIST = ../include/*.hpp ../include/openssl/*.h diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am index 4549c218d87..5bf45074a98 100644 --- a/extra/yassl/taocrypt/src/Makefile.am +++ b/extra/yassl/taocrypt/src/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I../include -I../../mySTL -noinst_LTLIBRARIES = libtaocrypt.la -libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \ +noinst_LIBRARIES = libtaocrypt.a +libtaocrypt_a_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \ coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp integer.cpp \ md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \ template_instnt.cpp |