bk commit into 5.0 tree (serg:1.2133)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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.2133 06/04/03 12:07:18 serg@stripped +4 -0
  yassl link problem fixed

  libmysql_r/Makefile.am
    1.25 06/04/03 12:06:54 serg@stripped +1 -5
    move common code to Makefile.shared

  libmysql/Makefile.shared
    1.67 06/04/03 12:06:53 serg@stripped +5 -0
    move common code to Makefile.shared

  libmysql/Makefile.am
    1.49 06/04/03 12:06:53 serg@stripped +1 -5
    move common code to Makefile.shared

  config/ac-macros/yassl.m4
    1.13 06/04/03 12:06:53 serg@stripped +1 -1
    typo

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.48/libmysql/Makefile.am	Sat Apr  1 01:20:01 2006
+++ 1.49/libmysql/Makefile.am	Mon Apr  3 12:06:53 2006
@@ -29,11 +29,7 @@ INCLUDES =	-I$(top_builddir)/include -I$
 include $(srcdir)/Makefile.shared
 
 libmysqlclient_la_SOURCES = $(target_sources)
-libmysqlclient_la_LIBADD = $(target_libadd)
-if HAVE_YASSL
-libmysqlclient_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \
-			   $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la
-endif
+libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_las)
 libmysqlclient_la_LDFLAGS = $(target_ldflags)
 EXTRA_DIST = Makefile.shared libmysql.def
 noinst_HEADERS = client_settings.h

--- 1.12/config/ac-macros/yassl.m4	Sat Apr  1 01:19:44 2006
+++ 1.13/config/ac-macros/yassl.m4	Mon Apr  3 12:06:53 2006
@@ -39,5 +39,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
   AC_SUBST(yassl_libs)
   AC_SUBST(yassl_includes)
   AC_SUBST(yassl_dir)
-  AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])
+  AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ])
 ])

--- 1.66/libmysql/Makefile.shared	Wed Jan 18 13:09:42 2006
+++ 1.67/libmysql/Makefile.shared	Mon Apr  3 12:06:53 2006
@@ -87,6 +87,11 @@ DEFS =			-DDEFAULT_CHARSET_HOME="\"$(MYS
 			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
 
+if HAVE_YASSL
+yassl_las = $(top_srcdir)/extra/yassl/src/libyassl.la \
+	    $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la
+endif
+
 # The automatic dependencies miss this
 #bmove_upp.lo:		$(LTCHARSET_OBJS)
 

--- 1.24/libmysql_r/Makefile.am	Sat Apr  1 01:20:22 2006
+++ 1.25/libmysql_r/Makefile.am	Mon Apr  3 12:06:54 2006
@@ -32,11 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.
 libmysql_dir = $(top_srcdir)/libmysql
 
 libmysqlclient_r_la_SOURCES = $(target_sources)
-libmysqlclient_r_la_LIBADD = $(target_libadd)
-if HAVE_YASSL
-libmysqlclient_r_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \
-			     $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la
-endif
+libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)
 libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
 
 # This is called from the toplevel makefile