make pam plugin to build in 5.5.

fix pam.tets for 5.5

4 files changed, 0 insertions, 66 deletions

diff --git a/plugin/auth_pam/Makefile.am b/plugin/auth_pam/Makefile.am
deleted file mode 100644
index be20d393781..00000000000
--- a/plugin/auth_pam/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRA_LTLIBRARIES      = auth_pam.la libauth_pam.la
-
-pkgplugindir=$(pkglibdir)/plugin
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-pkgplugin_LTLIBRARIES  = @plugin_auth_pam_shared_target@
-auth_pam_la_LDFLAGS    = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -lpam
-auth_pam_la_CFLAGS     = -shared -DMYSQL_DYNAMIC_PLUGIN
-auth_pam_la_SOURCES    = auth_pam.c
-
-noinst_LTLIBRARIES     = @plugin_auth_pam_static_target@
-libauth_pam_la_LDFLAGS = -lpam
-libauth_pam_la_SOURCES = auth_pam.c
-
-EXTRA_DIST = plug.in
-
diff --git a/plugin/auth_pam/plug.in b/plugin/auth_pam/plug.in
deleted file mode 100644
index 05af6ce6461..00000000000
--- a/plugin/auth_pam/plug.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MYSQL_PLUGIN(auth_pam, [PAM Authentication Plugin], [PAM Authentication Plugin])
-MYSQL_PLUGIN_DYNAMIC(auth_pam, [auth_pam.la])
-
-AC_CHECK_HEADER([security/pam_appl.h],,[MYSQL_PLUGIN_WITHOUT(auth_pam)])
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])
-])
-