diff options
| author | unknown <kent@mysql.com> | 2006-04-05 10:39:44 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-05 10:39:44 +0200 |
| commit | bae996f67c96909abd5ed0d44072e03e72e8e360 (patch) | |
| tree | cc22ce24422cf2acb4cfa7b627f762b32f4c66b3 /libmysql | |
| parent | 07302c60078b21b90d00b80677beced5de521f10 (diff) | |
| parent | 57cfa4d17c1e2e05fa71e19c126a59c8a6a03c81 (diff) | |
| download | mariadb-git-bae996f67c96909abd5ed0d44072e03e72e8e360.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/tmp_merge
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
config/ac-macros/yassl.m4:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 6 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 05858f4fb6e..9a6f418fa49 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -29,11 +29,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ include $(srcdir)/Makefile.shared libmysqlclient_la_SOURCES = $(target_sources) -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_LIBADD = $(target_libadd) $(yassl_las) libmysqlclient_la_LDFLAGS = $(target_ldflags) EXTRA_DIST = Makefile.shared libmysql.def dll.c mytest.c cmakelists.txt noinst_HEADERS = client_settings.h diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index c4c9c0036e2..a641bdf2f10 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -87,6 +87,11 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) +if HAVE_YASSL +yassl_las = $(top_srcdir)/extra/yassl/src/libyassl.la \ + $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +endif + # The automatic dependencies miss this #bmove_upp.lo: $(LTCHARSET_OBJS) |