diff options
| author | acurtis@xiphis.org <> | 2006-04-24 14:32:45 -0700 |
|---|---|---|
| committer | acurtis@xiphis.org <> | 2006-04-24 14:32:45 -0700 |
| commit | e2ac9dda830469aa32f646f32300af47b4094e9f (patch) | |
| tree | 2b0a325ef689aa115e3396354d11016e3f7e8a86 /config | |
| parent | 53d4594cfe03a9b440edf09639635a024e04b079 (diff) | |
| download | mariadb-git-e2ac9dda830469aa32f646f32300af47b4094e9f.tar.gz | |
WL#3201
post-merge fixes
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/plugins.m4 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index 20d7e2cc11c..8ea5aca2595 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -238,6 +238,7 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[ dnl _MYSQL_CHECK_PLUGIN_ARGS([$1]) _MYSQL_CONFIGURE_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,])) _MYSQL_DO_PLUGIN_ACTIONS(m4_bpatsubst(__mysql_plugin_list__, :, [,])) + _MYSQL_POST_PLUGIN_FIXUP() ]) dnl ]) dnl ]) @@ -661,5 +662,22 @@ _MYSQL_MODULE_ARGS_CHECK(m4_bpatsubst(__mysql_plugin_list__, :, [,])) _MYSQL_CHECK_DEPENDENCIES(m4_bpatsubst(__mysql_plugin_list__, :, [,])) ]) +AC_DEFUN([_MYSQL_POST_PLUGIN_FIXUP],[ + for plugdir in $mysql_plugin_dirs; do + case "$plugdir" in + storage/* ) + mysql_se_dirs="$mysql_se_dirs `echo $plugdir | sed -e 's@^storage/@@'`" + ;; + plugin/* ) + mysql_pg_dirs="$mysql_pg_dirs `echo $plugdir | sed -e 's@^plugin/@@'`" + ;; + *) + AC_MSG_ERROR([don't know how to handle plugin dir $plugdir]) + ;; + esac + done + AC_SUBST(mysql_se_dirs) + AC_SUBST(mysql_pg_dirs) +]) dnl =========================================================================== |