List:Commits« Previous MessageNext Message »
From:kent Date:April 5 2006 10:56am
Subject:bk commit into 5.1 tree (kent:1.2285)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2285 06/04/05 12:56:05 kent@stripped +1 -0
  Makefile.am:
    After merge correction

  libmysqld/Makefile.am
    1.82 06/04/05 11:32:37 kent@stripped +5 -1
    After merge correction

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-534072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new

--- 1.81/libmysqld/Makefile.am	2006-03-24 22:50:45 +01:00
+++ 1.82/libmysqld/Makefile.am	2006-04-05 11:32:37 +02:00
@@ -94,8 +94,12 @@
 		$(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
 
Thread
bk commit into 5.1 tree (kent:1.2285)kent5 Apr