diff options
| author | unknown <kent@mysql.com> | 2006-04-05 12:56:05 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-05 12:56:05 +0200 |
| commit | ac28585c76bd0e730d1cbbad26fffdb6264ed277 (patch) | |
| tree | ada33fa75a861a816c9f6eb3088d5c2234abc2a2 /libmysqld | |
| parent | bae996f67c96909abd5ed0d44072e03e72e8e360 (diff) | |
| download | mariadb-git-ac28585c76bd0e730d1cbbad26fffdb6264ed277.tar.gz | |
Makefile.am:
After merge correction
libmysqld/Makefile.am:
After merge correction
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index b5d437918ae..961eea21d2a 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -94,8 +94,12 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/vio/libvio.a \ @mysql_se_libs@ \ - @yassl_libs_with_path@ + $(yassl_las) +if HAVE_YASSL +yassl_las = $(top_srcdir)/extra/yassl/src/libyassl.la \ + $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +endif # Storage engine specific compilation options |