diff options
| -rw-r--r-- | config/ac-macros/plugins.m4 | 22 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | storage/archive/plug.in | 5 | ||||
| -rw-r--r-- | storage/example/plug.in | 5 |
4 files changed, 31 insertions, 13 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index bd176d4acd7..c70aba0bc34 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -249,7 +249,6 @@ AC_DEFUN([MYSQL_PLUGIN_ACTIONS],[ ]) ]) - dnl --------------------------------------------------------------------------- dnl Macro: MYSQL_CONFIGURE_PLUGINS dnl @@ -267,6 +266,10 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[ AC_FATAL([cannot use [MYSQL_CONFIGURE_PLUGINS] multiple times]) ],[ m4_define([__mysql_plugin_configured__],[done]) + _MYSQL_INCLUDE_LIST( + m4_bpatsubst(m4_esyscmd([ls plugin/*/plug.in storage/*/plug.in 2>/dev/null]), +[[ +]],[,])) m4_ifdef([__mysql_plugin_list__],[ _MYSQL_CHECK_PLUGIN_ARGS([$1]) _MYSQL_CONFIGURE_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,])) @@ -730,4 +733,21 @@ _MYSQL_EMIT_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,])) _MYSQL_EMIT_PLUGIN_DEPENDS(m4_bpatsubst(__mysql_plugin_list__, :, [,])) ]) +dnl --------------------------------------------------------------------------- +dnl Macro: _MYSQL_INCLUDE_LIST +dnl +dnl SYNOPSIS +dnl _MYSQL_INCLUDE_LIST([filename,filename...]) +dnl +dnl DESCRIPTION +dnl includes all files from the list +dnl +dnl --------------------------------------------------------------------------- +AC_DEFUN([_MYSQL_INCLUDE_LIST],[ + ifelse([$1], [], [], [ + sinclude($1) + _MYSQL_INCLUDE_LIST(m4_shift($@)) + ]) +]) + dnl =========================================================================== diff --git a/configure.in b/configure.in index 162bff48b7f..3a2398e0ed4 100644 --- a/configure.in +++ b/configure.in @@ -52,12 +52,6 @@ romanian russian serbian slovak spanish swedish ukrainian" # Declare our plugin modules #-------------------------------------------------------------------- -MYSQL_STORAGE_ENGINE(archive,, [Archive Storage Engine], - [Archive Storage Engine], [max,max-no-ndb]) -MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive]) -MYSQL_PLUGIN_STATIC(archive, [libarchive.a]) -MYSQL_PLUGIN_DYNAMIC(archive, [ha_archive.la]) - MYSQL_STORAGE_ENGINE(berkeley, berkeley-db, [BerkeleyDB Storage Engine], [Transactional Tables using BerkeleyDB], [max,max-no-ndb]) MYSQL_PLUGIN_DIRECTORY(berkeley,[storage/bdb]) @@ -76,12 +70,6 @@ MYSQL_PLUGIN_DIRECTORY(csv, [storage/csv]) MYSQL_PLUGIN_STATIC(csv, [libcsv.a]) MYSQL_PLUGIN_MANDATORY(csv) dnl Used for logging -MYSQL_STORAGE_ENGINE(example,, [Example Storage Engine], - [Skeleton for Storage Engines for developers], [max,max-no-ndb]) -MYSQL_PLUGIN_DIRECTORY(example, [storage/example]) -MYSQL_PLUGIN_STATIC(example, [libexample.a]) -MYSQL_PLUGIN_DYNAMIC(example, [ha_example.la]) - MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine], [Connects to tables on remote MySQL servers], [max,max-no-ndb]) diff --git a/storage/archive/plug.in b/storage/archive/plug.in new file mode 100644 index 00000000000..e5424dd0762 --- /dev/null +++ b/storage/archive/plug.in @@ -0,0 +1,5 @@ +MYSQL_STORAGE_ENGINE(archive,, [Archive Storage Engine], + [Archive Storage Engine], [max,max-no-ndb]) +MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive]) +MYSQL_PLUGIN_STATIC(archive, [libarchive.a]) +MYSQL_PLUGIN_DYNAMIC(archive, [ha_archive.la]) diff --git a/storage/example/plug.in b/storage/example/plug.in new file mode 100644 index 00000000000..10ab920c718 --- /dev/null +++ b/storage/example/plug.in @@ -0,0 +1,5 @@ +MYSQL_STORAGE_ENGINE(example,, [Example Storage Engine], + [Skeleton for Storage Engines for developers], [max,max-no-ndb]) +MYSQL_PLUGIN_DIRECTORY(example, [storage/example]) +MYSQL_PLUGIN_STATIC(example, [libexample.a]) +MYSQL_PLUGIN_DYNAMIC(example, [ha_example.la]) |