diff options
| author | kent@mysql.com <> | 2006-04-04 23:37:44 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2006-04-04 23:37:44 +0200 |
| commit | b492d05ee9db54726c19a0c246505d4002a41dac (patch) | |
| tree | d7f97f7f906b9107f2569658a74eb1ae2f1eea72 /libmysql | |
| parent | d99d4d9bb10e508601bde557fc54bcb4c7d84f81 (diff) | |
| parent | 0298bfaac649ba00d56c3be3e1062f0262367c14 (diff) | |
| download | mariadb-git-b492d05ee9db54726c19a0c246505d4002a41dac.tar.gz | |
Merge
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 8cc29ec690a..05858f4fb6e 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -29,7 +29,11 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ include $(srcdir)/Makefile.shared libmysqlclient_la_SOURCES = $(target_sources) -libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_libs_with_path) +libmysqlclient_la_LIBADD = $(target_libadd) +if HAVE_YASSL +libmysqlclient_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \ + $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +endif libmysqlclient_la_LDFLAGS = $(target_ldflags) EXTRA_DIST = Makefile.shared libmysql.def dll.c mytest.c cmakelists.txt noinst_HEADERS = client_settings.h |