bk commit into 5.0 tree (msvensson:1.1945) BUG#12985

[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.1945 05/10/27 21:48:43 msvensson@neptunus.(none) +6 -0
  BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking
   - Remove yassl_libsfrom CLIENT_LIBS var
   - Add yassl_libs to libmysql and libmysqld

  libmysqld/Makefile.am
    1.63 05/10/27 21:48:37 msvensson@neptunus.(none) +3 -1
    Add yassl_libss_with_path to libmysqld

  libmysql/Makefile.am
    1.45 05/10/27 21:48:37 msvensson@neptunus.(none) +1 -1
    Add yassl_libs to libmysql

  extra/yassl/taocrypt/src/Makefile.am
    1.7 05/10/27 21:48:37 msvensson@neptunus.(none) +2 -2
    Make a normal .a lib

  extra/yassl/src/Makefile.am
    1.7 05/10/27 21:48:37 msvensson@neptunus.(none) +2 -2
    Make a normal .a lib

  configure.in
    1.347 05/10/27 21:48:37 msvensson@neptunus.(none) +1 -1
    Don't add yassl_libs to CLIENT_LIBS var since clients will be linked with libmysqlclient that includes yassl libs.

  config/ac-macros/yassl.m4
    1.6 05/10/27 21:48:37 msvensson@neptunus.(none) +2 -0
    Add variable yassl_libs_with_path variable for libmysqld

# 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:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug12985/my50-bug12985

--- 1.346/configure.in	2005-10-18 15:43:53 +02:00
+++ 1.347/configure.in	2005-10-27 21:48:37 +02:00
@@ -2423,7 +2423,7 @@
   AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
 fi
 
-CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $yassl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
+CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
 
 AC_SUBST(CLIENT_LIBS)
 AC_SUBST(NON_THREADED_LIBS)

--- 1.44/libmysql/Makefile.am	2005-10-18 15:43:53 +02:00
+++ 1.45/libmysql/Makefile.am	2005-10-27 21:48:37 +02:00
@@ -22,7 +22,7 @@
 
 target =	libmysqlclient.la
 target_defs =	-DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
-LIBS =		@CLIENT_LIBS@
+LIBS =		@CLIENT_LIBS@ @yassl_libs@
 INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include \
 		$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
 

--- 1.62/libmysqld/Makefile.am	2005-10-18 15:43:53 +02:00
+++ 1.63/libmysqld/Makefile.am	2005-10-27 21:48:37 +02:00
@@ -80,7 +80,9 @@
 		$(top_builddir)/mysys/libmysys.a \
 		$(top_builddir)/strings/libmystrings.a \
 		$(top_builddir)/dbug/libdbug.a \
-		$(top_builddir)/vio/libvio.a
+		$(top_builddir)/vio/libvio.a \
+                @yassl_libs_with_path@
+		
 
 #
 # To make it easy for the end user to use the embedded library we

--- 1.5/config/ac-macros/yassl.m4	2005-10-18 15:43:53 +02:00
+++ 1.6/config/ac-macros/yassl.m4	2005-10-27 21:48:37 +02:00
@@ -16,6 +16,7 @@
     AC_MSG_RESULT([using bundled yaSSL])
     yassl_dir="extra/yassl"
     yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"
+    yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.a \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.a"
     yassl_includes="-I\$(top_srcdir)/extra/yassl/include"
     AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
   else
@@ -25,5 +26,6 @@
   AC_SUBST(yassl_libs)
   AC_SUBST(yassl_includes)
   AC_SUBST(yassl_dir)
+  AC_SUBST(yassl_libs_with_path)
   AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])
 ])

--- 1.6/extra/yassl/src/Makefile.am	2005-08-11 21:26:13 +02:00
+++ 1.7/extra/yassl/src/Makefile.am	2005-10-27 21:48:37 +02:00
@@ -1,7 +1,7 @@
 INCLUDES = -I../include -I../taocrypt/include -I../mySTL
 
-noinst_LTLIBRARIES = libyassl.la
-libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
+noinst_LIBRARIES = libyassl.a
+libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
 	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 = ../include/*.hpp ../include/openssl/*.h

--- 1.6/extra/yassl/taocrypt/src/Makefile.am	2005-08-11 21:26:13 +02:00
+++ 1.7/extra/yassl/taocrypt/src/Makefile.am	2005-10-27 21:48:37 +02:00
@@ -1,7 +1,7 @@
 INCLUDES = -I../include -I../../mySTL
 
-noinst_LTLIBRARIES = libtaocrypt.la
-libtaocrypt_la_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
+noinst_LIBRARIES = libtaocrypt.a
+libtaocrypt_a_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
 	coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp integer.cpp \
 	md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \
 	template_instnt.cpp