diff options
| author | serg@sergbook.mysql.com <> | 2006-05-04 17:14:56 -0400 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2006-05-04 17:14:56 -0400 |
| commit | 376117eb988bf3ac33782c372a3c666b242b7321 (patch) | |
| tree | 578066bba37b961814e3f08bde2833c3caec8ff4 /config | |
| parent | 17b46953cafd4fa730a377bd25f212d5827d6b0f (diff) | |
| download | mariadb-git-376117eb988bf3ac33782c372a3c666b242b7321.tar.gz | |
auto-include plug.in, remove the need for plugins to modify configure.in
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/plugins.m4 | 22 |
1 files changed, 21 insertions, 1 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 =========================================================================== |