diff options
| author | unknown <kent@mysql.com> | 2006-04-04 23:37:44 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-04 23:37:44 +0200 |
| commit | 07302c60078b21b90d00b80677beced5de521f10 (patch) | |
| tree | d7f97f7f906b9107f2569658a74eb1ae2f1eea72 /libmysql | |
| parent | af66d20c8eed478ea0a81ba38fea07152823a9d0 (diff) | |
| parent | b5ca723613666bc6472de8d02e50fee7ea7785ef (diff) | |
| download | mariadb-git-07302c60078b21b90d00b80677beced5de521f10.tar.gz | |
Merge
VC++Files/libmysqld/libmysqld.vcproj:
Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
Auto merged
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
VC++Files/storage/bdb/bdb.vcproj:
Auto merged
VC++Files/storage/innobase/innobase.vcproj:
Auto merged
config/ac-macros/yassl.m4:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/item.cc:
Auto merged
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 |