summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2006-04-05 12:56:05 +0200
committerunknown <kent@mysql.com>2006-04-05 12:56:05 +0200
commitac28585c76bd0e730d1cbbad26fffdb6264ed277 (patch)
treeada33fa75a861a816c9f6eb3088d5c2234abc2a2
parentbae996f67c96909abd5ed0d44072e03e72e8e360 (diff)
downloadmariadb-git-ac28585c76bd0e730d1cbbad26fffdb6264ed277.tar.gz
Makefile.am:
After merge correction libmysqld/Makefile.am: After merge correction
-rw-r--r--libmysqld/Makefile.am6
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