bk commit into 5.0 tree (kent:1.2126) BUG#18273

[kent]

Below is the list of changes that have just been committed into a local
5.0 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.2126 06/04/01 01:24:28 kent@stripped +3 -0
  Makefile.am, yassl.m4:
    Enable automake to determine dependency on yaSSL, by explicitly
    listing the .la files in Makefile.am, instead of using
    'yassl_libs_with_path', bug#18273

  libmysql_r/Makefile.am
    1.24 06/04/01 01:20:22 kent@stripped +5 -1
    Enable automake to determine dependency on yaSSL, by explicitly
    listing the .la files in Makefile.am, instead of using
    'yassl_libs_with_path', bug#18273

  libmysql/Makefile.am
    1.48 06/04/01 01:20:01 kent@stripped +5 -1
    Enable automake to determine dependency on yaSSL, by explicitly
    listing the .la files in Makefile.am, instead of using
    'yassl_libs_with_path', bug#18273

  config/ac-macros/yassl.m4
    1.12 06/04/01 01:19:44 kent@stripped +0 -2
    Enable automake to determine dependency on yaSSL, by explicitly
    listing the .la files in Makefile.am, instead of using
    'yassl_libs_with_path', bug#18273

# 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-4d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-new

--- 1.47/libmysql/Makefile.am	2005-11-28 16:27:56 +01:00
+++ 1.48/libmysql/Makefile.am	2006-04-01 01:20:01 +02:00
@@ -29,7 +29,11 @@
 include $(srcdir)/Makefile.shared
 
 libmysqlclient_la_SOURCES = $(target_sources)
-libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)
+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_LDFLAGS = $(target_ldflags)
 EXTRA_DIST = Makefile.shared libmysql.def
 noinst_HEADERS = client_settings.h

--- 1.11/config/ac-macros/yassl.m4	2006-01-09 10:00:57 +01:00
+++ 1.12/config/ac-macros/yassl.m4	2006-04-01 01:19:44 +02:00
@@ -17,7 +17,6 @@
     yassl_dir="extra/yassl"
     yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl
-L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"
     yassl_includes="-I\$(top_srcdir)/extra/yassl/include"
-    yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.la
\$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la"
     AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL
emulation.])
     AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for OpenSSL
emulation.])
     # System specific checks
@@ -38,7 +37,6 @@
     AC_MSG_RESULT(no)
   fi
   AC_SUBST(yassl_libs)
-  AC_SUBST(yassl_libs_with_path)
   AC_SUBST(yassl_includes)
   AC_SUBST(yassl_dir)
   AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])

--- 1.23/libmysql_r/Makefile.am	2006-01-09 10:00:58 +01:00
+++ 1.24/libmysql_r/Makefile.am	2006-04-01 01:20:22 +02:00
@@ -32,7 +32,11 @@
 libmysql_dir = $(top_srcdir)/libmysql
 
 libmysqlclient_r_la_SOURCES = $(target_sources)
-libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)
+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_LDFLAGS = $(target_ldflags)
 
 # This is called from the toplevel makefile