bk commit into 5.0 tree (msvensson:1.2159)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.2159 06/05/31 23:06:56 msvensson@shellback.(none) +2 -0
  Add define YASLSL_PREFIX

  extra/yassl/testsuite/Makefile.am
    1.3 06/05/31 23:06:51 msvensson@shellback.(none) +1 -1
    Add defined YASSL_PREFIX when building yassl/testsuite

  extra/yassl/src/Makefile.am
    1.10 06/05/31 23:06:51 msvensson@shellback.(none) +1 -1
    Add defined YASSL_PREFIX when building yassl/src

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.2/extra/yassl/testsuite/Makefile.am	2006-04-21 19:53:26 +02:00
+++ 1.3/extra/yassl/testsuite/Makefile.am	2006-05-31 23:06:51 +02:00
@@ -5,7 +5,7 @@
 	../examples/echoclient/echoclient.cpp \
 	../examples/echoserver/echoserver.cpp
 testsuite_LDFLAGS  = -L../src/ -L../taocrypt/src
-testsuite_CXXFLAGS = -DYASSL_PURE_C -DNO_MAIN_DRIVER
+testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER
 testsuite_LDADD    = -lyassl -ltaocrypt
 testsuite_DEPENDENCIES = ../src/libyassl.la ../taocrypt/src/libtaocrypt.la
 EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat

--- 1.9/extra/yassl/src/Makefile.am	2005-11-24 17:17:29 +01:00
+++ 1.10/extra/yassl/src/Makefile.am	2006-05-31 23:06:51 +02:00
@@ -5,4 +5,4 @@
 	handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \
 	template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp
 EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)
-AM_CXXFLAGS = -DYASSL_PURE_C
+AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX