Merge mysql.com:/Users/kent/mysql/bk/tmp_merge

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

config/ac-macros/yassl.m4

@@ -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" ])
 ])

libmysql/Makefile.am

@@ -29,11 +29,7 @@ INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include \
 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 dll.c mytest.c cmakelists.txt
 noinst_HEADERS = client_settings.h

libmysql/Makefile.shared

@@ -87,6 +87,11 @@ DEFS =			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
 			-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)
 

libmysql_r/Makefile.am

@@ -32,11 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.shared
 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