Makefile.am:

After merge correction

Makefile.am:
After merge correction
196521bd · kent@mysql.com · 1f88c4e5 · 196521bd
Commit 196521bd authored Apr 05, 2006 by kent@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

libmysqld/Makefile.am libmysqld/Makefile.am +5 -1

No files found.
--- 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