Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

2 files changed, 7 insertions, 7 deletions

diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am
index 83397e24168..4ebb9a2d862 100644
--- a/extra/yassl/src/Makefile.am
+++ b/extra/yassl/src/Makefile.am
@@ -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
diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am
index c4fc4607622..354be165877 100644
--- a/extra/yassl/taocrypt/src/Makefile.am
+++ b/extra/yassl/taocrypt/src/Makefile.am
@@ -1,12 +1,12 @@
 INCLUDES = -I../include -I../../mySTL
 
-noinst_LTLIBRARIES = libtaocrypt.la libtaoint.la
-libtaocrypt_la_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
+noinst_LIBRARIES = libtaocrypt.a libtaoint.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 \
 	md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \
 	template_instnt.cpp
-libtaocrypt_la_LIBADD = libtaoint.la
-libtaoint_la_SOURCES = integer.cpp
-libtaoint_la_CXXFLAGS = @yassl_integer_extra_cxxflags@
+libtaocrypt_a_LIBADD = libtaoint.a
+libtaoint_a_SOURCES = integer.cpp
+libtaoint_a_CXXFLAGS = @yassl_integer_extra_cxxflags@
 EXTRA_DIST = ../include/*.hpp
 AM_CXXFLAGS = -DYASSL_PURE_C