diff options
| author | unknown <kent@mysql.com> | 2006-04-01 01:24:28 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-01 01:24:28 +0200 |
| commit | 872d1d71a1d6b6aba2aa0af98cdffb4bb3c01325 (patch) | |
| tree | 00ced9c27de60a02e0481185d3be265303992e56 /libmysql_r | |
| parent | fa7e5ed5d7c6f40ddebe88de099f4ba0ee502d47 (diff) | |
| download | mariadb-git-872d1d71a1d6b6aba2aa0af98cdffb4bb3c01325.tar.gz | |
Makefile.am, yassl.m4:
Enable automake to determine dependency on yaSSL, by explicitly
listing the .la files in Makefile.am, instead of using
'yassl_libs_with_path', bug#18273
config/ac-macros/yassl.m4:
Enable automake to determine dependency on yaSSL, by explicitly
listing the .la files in Makefile.am, instead of using
'yassl_libs_with_path', bug#18273
libmysql/Makefile.am:
Enable automake to determine dependency on yaSSL, by explicitly
listing the .la files in Makefile.am, instead of using
'yassl_libs_with_path', bug#18273
libmysql_r/Makefile.am:
Enable automake to determine dependency on yaSSL, by explicitly
listing the .la files in Makefile.am, instead of using
'yassl_libs_with_path', bug#18273
Diffstat (limited to 'libmysql_r')
| -rw-r--r-- | libmysql_r/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 11e65a28a19..7bd3b0f4bbe 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -32,7 +32,11 @@ include $(top_srcdir)/libmysql/Makefile.shared libmysql_dir = $(top_srcdir)/libmysql libmysqlclient_r_la_SOURCES = $(target_sources) -libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path) +libmysqlclient_r_la_LIBADD = $(target_libadd) +if HAVE_YASSL +libmysqlclient_r_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \ + $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +endif libmysqlclient_r_la_LDFLAGS = $(target_ldflags) # This is called from the toplevel makefile |