Add new pkgplugindir handling to seperate plugins from libraries,

and allow override for binary distributions.  Extend mysql_config
to print compiled-in plugin location for third-party plugins to
use.  Resolves bug#31736.


libmysqld/Makefile.am:
  Use pkgplugindir.
plugin/daemon_example/Makefile.am:
  Use pkgplugindir.
plugin/fulltext/Makefile.am:
  Use pkgplugindir.
scripts/Makefile.am:
  Add pkgplugindir.
scripts/make_binary_distribution.sh:
  Add pkgplugindir.
scripts/mysql_config.sh:
  Add pkgplugindir.
sql/Makefile.am:
  Use pkgplugindir.
sql/mysqld.cc:
  Use PLUGINDIR, derived from pkgplugindir, instead of
  LIBDIR for plugins.
sql/unireg.h:
  Use PLUGINDIR instead of LIBDIR, and define to be the
  default setting of pkgplugindir.
storage/innobase/Makefile.am:
  Use pkgplugindir.
storage/archive/Makefile.am:
  Use pkgplugindir.
storage/blackhole/Makefile.am:
  Use pkgplugindir.
storage/example/Makefile.am:
  Use pkgplugindir.
storage/federated/Makefile.am:
  Use pkgplugindir.

5 files changed, 14 insertions, 9 deletions

diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am
index 4920527e0e9..55f2380ec31 100644
--- a/storage/archive/Makefile.am
+++ b/storage/archive/Makefile.am
@@ -19,6 +19,7 @@ MYSQLDATAdir =          $(localstatedir)
 MYSQLSHAREdir =         $(pkgdatadir)
 MYSQLBASEdir=           $(prefix)
 MYSQLLIBdir=            $(pkglibdir)
+pkgplugindir =		$(libdir)/@PACKAGE@/plugin
 INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/sql \
@@ -33,8 +34,8 @@ noinst_HEADERS =	ha_archive.h azlib.h
 noinst_PROGRAMS	=	archive_test archive_reader
 
 EXTRA_LTLIBRARIES =	ha_archive.la
-pkglib_LTLIBRARIES =	@plugin_archive_shared_target@
-ha_archive_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)
+pkgplugin_LTLIBRARIES =	@plugin_archive_shared_target@
+ha_archive_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 ha_archive_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_archive_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_archive_la_SOURCES =	ha_archive.cc azio.c
diff --git a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am
index 9dd533dd4fa..9810dff5866 100644
--- a/storage/blackhole/Makefile.am
+++ b/storage/blackhole/Makefile.am
@@ -19,6 +19,7 @@ MYSQLDATAdir =          $(localstatedir)
 MYSQLSHAREdir =         $(pkgdatadir)
 MYSQLBASEdir=           $(prefix)
 MYSQLLIBdir=            $(pkglibdir)
+pkgplugindir =		$(libdir)/@PACKAGE@/plugin
 INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/sql \
@@ -32,8 +33,8 @@ DEFS =                  @DEFS@
 noinst_HEADERS =	ha_blackhole.h
 
 EXTRA_LTLIBRARIES =	ha_blackhole.la
-pkglib_LTLIBRARIES =	@plugin_blackhole_shared_target@
-ha_blackhole_la_LDFLAGS=-module -rpath $(MYSQLLIBdir)
+pkgplugin_LTLIBRARIES =	@plugin_blackhole_shared_target@
+ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
 ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_blackhole_la_CFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_blackhole_la_SOURCES=ha_blackhole.cc
diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am
index 73016d24b57..bf121e70f29 100644
--- a/storage/example/Makefile.am
+++ b/storage/example/Makefile.am
@@ -19,6 +19,7 @@ MYSQLDATAdir =          $(localstatedir)
 MYSQLSHAREdir =         $(pkgdatadir)
 MYSQLBASEdir=           $(prefix)
 MYSQLLIBdir=            $(pkglibdir)
+pkgplugindir =		$(libdir)/@PACKAGE@/libdir
 INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/sql \
@@ -32,8 +33,8 @@ DEFS =                  @DEFS@
 noinst_HEADERS =	ha_example.h
 
 EXTRA_LTLIBRARIES =	ha_example.la
-pkglib_LTLIBRARIES =	@plugin_example_shared_target@
-ha_example_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)
+pkgplugin_LTLIBRARIES =	@plugin_example_shared_target@
+ha_example_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 ha_example_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_example_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_example_la_SOURCES =	ha_example.cc
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am
index 287b2cb1696..d2ee37c402a 100644
--- a/storage/federated/Makefile.am
+++ b/storage/federated/Makefile.am
@@ -19,6 +19,7 @@ MYSQLDATAdir =          $(localstatedir)
 MYSQLSHAREdir =         $(pkgdatadir)
 MYSQLBASEdir=           $(prefix)
 MYSQLLIBdir=            $(pkglibdir)
+pkgplugindir =		$(libdir)/@PACKAGE@/plugin
 INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/sql \
@@ -32,8 +33,8 @@ DEFS =                  @DEFS@
 noinst_HEADERS =	ha_federated.h
 
 EXTRA_LTLIBRARIES =	ha_federated.la
-pkglib_LTLIBRARIES =	@plugin_federated_shared_target@
-ha_federated_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)
+pkgplugin_LTLIBRARIES =	@plugin_federated_shared_target@
+ha_federated_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 ha_federated_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_federated_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_federated_la_SOURCES =	ha_federated.cc
diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am
index 30e056d68fb..8a5ce6d8a4b 100644
--- a/storage/innobase/Makefile.am
+++ b/storage/innobase/Makefile.am
@@ -19,6 +19,7 @@ MYSQLDATAdir =          $(localstatedir)
 MYSQLSHAREdir =         $(pkgdatadir)
 MYSQLBASEdir=           $(prefix)
 MYSQLLIBdir=            $(pkglibdir)
+pkgplugindir =		$(libdir)/@PACKAGE@/libdir
 INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/storage/innobase/include \
@@ -160,7 +161,7 @@ libinnobase_a_CFLAGS  =	$(AM_CFLAGS)
 EXTRA_LTLIBRARIES =	ha_innodb.la
 pkglib_LTLIBRARIES =	@plugin_innobase_shared_target@
 
-ha_innodb_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)
+ha_innodb_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 ha_innodb_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_innodb_la_CFLAGS  =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_innodb_la_SOURCES =	$(libinnobase_a_SOURCES)