From c565ca2bf2a0e36df5587433446640de3c9d45cd Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Mon, 28 Nov 2005 16:28:00 +0100
Subject: Include libyassl.la and libtaocrypt.la in libmysqlclient.la

config/ac-macros/yassl.m4:
  Specify path to yassl libs
libmysql/Makefile.am:
  Add yassl .la libs to libmysqlclient.la
---
 config/ac-macros/yassl.m4 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config/ac-macros')

diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4
index d1216554862..77208faee0c 100644
--- a/config/ac-macros/yassl.m4
+++ b/config/ac-macros/yassl.m4
@@ -17,6 +17,7 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
     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
@@ -35,6 +36,7 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
     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" ])
-- 
cgit v1.2.1