summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-11-28 16:28:00 +0100
committermsvensson@neptunus.(none) <>2005-11-28 16:28:00 +0100
commit9a84dcc1ac2267ddb40c04189940b984763f546b (patch)
treee47bb17b3bb06bdbd3562d13a8f7cf83724a0bc3 /config
parent814f6c6cf0b4af09e63b4a16363cc84cba5d5073 (diff)
downloadmariadb-git-9a84dcc1ac2267ddb40c04189940b984763f546b.tar.gz
Include libyassl.la and libtaocrypt.la in libmysqlclient.la
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/yassl.m42
1 files changed, 2 insertions, 0 deletions
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" ])