summaryrefslogtreecommitdiff
path: root/config/ac-macros
diff options
context:
space:
mode:
authormsvensson@shellback.(none) <>2006-05-31 16:19:06 +0200
committermsvensson@shellback.(none) <>2006-05-31 16:19:06 +0200
commit20217ba36f11fde8eba391bab6fdeaed28900d73 (patch)
treeeec37d5fd4ee259d7eacec279bb80e6952f0a995 /config/ac-macros
parent971dc90e3ae52ec34f09f3d706c51ee2dab53177 (diff)
downloadmariadb-git-20217ba36f11fde8eba391bab6fdeaed28900d73.tar.gz
Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
- Include prefix files that renames all public functions in yaSSLs OpenSSL API to ya<function_name>. They will otherwise conflict with OpenSSL functions if loaded by an application that uses OpenSSL as well as libmysqlclient with yaSSL support.
Diffstat (limited to 'config/ac-macros')
-rw-r--r--config/ac-macros/yassl.m42
1 files changed, 0 insertions, 2 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4
index 5beb87c7652..2dc231c1f5a 100644
--- a/config/ac-macros/yassl.m4
+++ b/config/ac-macros/yassl.m4
@@ -19,7 +19,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
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_includes="-I\$(top_srcdir)/extra/yassl/include"
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
@@ -40,7 +39,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
AC_MSG_RESULT(no)
fi
AC_SUBST(yassl_libs)
- AC_SUBST(yassl_includes)
AC_SUBST(yassl_dir)
AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ])
])