diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-03 10:31:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-03 10:31:39 +0100 |
| commit | 892cd36992030a6cca91ac0c0228656842720a27 (patch) | |
| tree | 2a95aaa53650a896e0213cc65de72c5e6339e584 /plugin/feedback | |
| parent | 6af588d8202705a3b6db6d6f9ffa4c87867d9a5b (diff) | |
| download | mariadb-git-892cd36992030a6cca91ac0c0228656842720a27.tar.gz | |
make pam plugin to build in 5.5.
fix pam.tets for 5.5
Diffstat (limited to 'plugin/feedback')
| -rw-r--r-- | plugin/feedback/Makefile.am | 18 | ||||
| -rw-r--r-- | plugin/feedback/plug.in | 28 |
2 files changed, 0 insertions, 46 deletions
diff --git a/plugin/feedback/Makefile.am b/plugin/feedback/Makefile.am deleted file mode 100644 index 7d2a61d593f..00000000000 --- a/plugin/feedback/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -pkgplugindir = $(pkglibdir)/plugin -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ - -I$(top_srcdir)/regex -I$(top_srcdir)/sql - -EXTRA_LTLIBRARIES = feedback.la libfeedback.la -pkgplugin_LTLIBRARIES = @plugin_feedback_shared_target@ -feedback_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -feedback_la_CXXFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN -feedback_la_SOURCES = feedback.cc utils.cc url_base.cc url_http.cc \ - sender_thread.cc - -noinst_LTLIBRARIES = @plugin_feedback_static_target@ -libfeedback_la_SOURCES= feedback.cc utils.cc url_base.cc url_http.cc \ - sender_thread.cc - -noinst_HEADERS = feedback.h -EXTRA_DIST = CMakeLists.txt plug.in - diff --git a/plugin/feedback/plug.in b/plugin/feedback/plug.in deleted file mode 100644 index 88a4448321d..00000000000 --- a/plugin/feedback/plug.in +++ /dev/null @@ -1,28 +0,0 @@ -MYSQL_PLUGIN(feedback,[MariaDB User Feedback Plugin], - [MariaDB User Feedback Plugin]) - -dnl Although it's not exactly obvious, top-level CMakeLists.txt parses plug.in -dnl files, in particular looking for what the library name should be. It uses -dnl regexp that matches MYSQL_PLUGIN_DYNAMIC or MYSQL_PLUGIN_STATIC, followed -dnl by an open parenthesys, and the plugin name. Having engine name enclosed in -dnl square brackets below causes this regexp to fail and as a result feedback -dnl plugin will not be considered for dynamic builds on Windows. -dnl Unfortunately, feedback cannot be built dynamically on Windows, because it -dnl needs to access server internals that aren't designed for plugin use and -dnl aren't marked with MYSQL_PLUGIN_IMPORT. -MYSQL_PLUGIN_DYNAMIC([feedback], [feedback.la]) -ifelse(index(AC_PACKAGE_NAME, [MariaDB]), -1, [], [ - -dnl MariaDB and MySQL define static plugins differently. -dnl I only support MariaDB here, for now. -MYSQL_PLUGIN_STATIC(feedback, [libfeedback.la]) - -]) - -dnl MariaDB before 5.5 needs this define: -MYSQL_PLUGIN_DEFINE(feedback, [WITH_FEEDBACK_PLUGIN]) - -MYSQL_PLUGIN_ACTIONS(feedback, [ - AC_CHECK_HEADERS([netdb.h sys/utsname.h]) -]) - |