summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-11-26 13:33:24 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2012-11-26 13:33:24 +0100
commitf8f2cdf21ff47cdbf7d81c5445281288b51c0298 (patch)
tree61afb93490e015d96c932e9350cd1b026fc5953e /plugin
parent3b572cd1197c7aa84010fd848908e41627f21a6d (diff)
downloadmariadb-git-f8f2cdf21ff47cdbf7d81c5445281288b51c0298.tar.gz
Fix broken feedback plugin after MDEV-712.
Link feedback plugin with yassl libraries, if with-ssl=bundled is used, since mysqld does not export SSL symbols anymore.
Diffstat (limited to 'plugin')
-rw-r--r--plugin/feedback/Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugin/feedback/Makefile.am b/plugin/feedback/Makefile.am
index 7d2a61d593f..339aabf0efc 100644
--- a/plugin/feedback/Makefile.am
+++ b/plugin/feedback/Makefile.am
@@ -5,6 +5,9 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
EXTRA_LTLIBRARIES = feedback.la libfeedback.la
pkgplugin_LTLIBRARIES = @plugin_feedback_shared_target@
feedback_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
+if HAVE_YASSL
+feedback_la_LIBADD = @yassl_libs@
+endif
feedback_la_CXXFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN
feedback_la_SOURCES = feedback.cc utils.cc url_base.cc url_http.cc \
sender_thread.cc