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 /configure.in | |
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 'configure.in')
-rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index d06cd0e1af1..080f0bf8c24 100644 --- a/configure.in +++ b/configure.in @@ -2423,7 +2423,7 @@ then AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe]) fi -CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $yassl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS" +CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS" AC_SUBST(CLIENT_LIBS) AC_SUBST(NON_THREADED_LIBS) |