From 8f457699a860f17641ba959ba8bda304d35705a5 Mon Sep 17 00:00:00 2001
From: "msvensson@devsrv-b.mysql.com" <>
Date: Thu, 24 Nov 2005 17:17:36 +0100
Subject: Bug #15168  	yassl failure on amd64  - Use libtool to build
 libraries

---
 libmysqld/Makefile.am          | 3 +--
 libmysqld/examples/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'libmysqld')

diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 8ddc8752f07..f07bbacba02 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -80,8 +80,7 @@ INC_LIB=	$(top_builddir)/regex/libregex.a \
 		$(top_builddir)/mysys/libmysys.a \
 		$(top_builddir)/strings/libmystrings.a \
 		$(top_builddir)/dbug/libdbug.a \
-		$(top_builddir)/vio/libvio.a \
-                @yassl_libs_with_path@
+		$(top_builddir)/vio/libvio.a
 		
 
 #
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index 925a6573efe..414cf63b003 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -34,8 +34,8 @@ link_sources:
 DEFS = 		-DEMBEDDED_LIBRARY
 INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \
 		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
-		$(openssl_includes)
-LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
+		$(openssl_includes) $(yassl_includes)
+LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
 LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
 
 mysqltest_embedded_LINK = $(CXXLINK)
-- 
cgit v1.2.1