Commit fbab1349 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new 

into  mysql.com:/home/bk/b18436-mysql-5.1-new
parents 94771e27 ac28585c

libmysqld/Makefile.am

+5 −1
Original line number Diff line number Diff line
@@ -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