diff options
| author | Vladimir Kolesnikov <vladimir@primebase.org> | 2009-12-09 22:39:23 +0100 |
|---|---|---|
| committer | Vladimir Kolesnikov <vladimir@primebase.org> | 2009-12-09 22:39:23 +0100 |
| commit | 8bc8de1ad3da108d741417f43ac40df771a66d1e (patch) | |
| tree | a03d76f2783945d3b3f0b44647b5c11039721d0b /config | |
| parent | 06fb006a1de2ca55b72bc81107531947082b3bac (diff) | |
| download | mariadb-git-8bc8de1ad3da108d741417f43ac40df771a66d1e.tar.gz | |
fixed bug #439889: Embedded server asserts on startup because of pbxt
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/plugins.m4 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index 41abdd159f2..8cccce037a2 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -463,11 +463,13 @@ dnl Although this is "pretty", it breaks libmysqld build mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]" [with_plugin_]$2=yes AC_MSG_RESULT([yes]) - m4_ifdef([$11],[ - condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp($11, [[^/]+$], [\&])" - condition_dependent_plugin_objects="$condition_dependent_plugin_objects m4_bregexp($11, [[^/]+\.], [\&o])" - condition_dependent_plugin_links="$condition_dependent_plugin_links $6/$11" - condition_dependent_plugin_includes="$condition_dependent_plugin_includes -I[\$(top_srcdir)]/$6/m4_bregexp($11, [^.+[/$]], [\&])" + m4_ifdef([$11], [ + m4_foreach([plugin], [$11], [ + condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp(plugin, [[^/]+$], [\&])" + condition_dependent_plugin_objects="$condition_dependent_plugin_objects m4_bregexp(plugin, [[^/]+\.], [\&o])" + condition_dependent_plugin_links="$condition_dependent_plugin_links $6/plugin" + condition_dependent_plugin_includes="$condition_dependent_plugin_includes -I[\$(top_srcdir)]/$6/m4_bregexp(plugin, [^.+[/$]], [\&])" + ]) ]) fi fi |