diff options
| author | acurtis@xiphis.org <> | 2006-05-02 04:11:00 -0700 |
|---|---|---|
| committer | acurtis@xiphis.org <> | 2006-05-02 04:11:00 -0700 |
| commit | f1d4921139a353c0f99751c6bfd710b81e074929 (patch) | |
| tree | 5d9330a6ecd663b4caf7da376b8a6372a8edeac7 /config | |
| parent | 09c7374d6941463ed40a7589aff6024f9e0db4e4 (diff) | |
| download | mariadb-git-f1d4921139a353c0f99751c6bfd710b81e074929.tar.gz | |
WL#3201 additional post-review fixes
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/plugins.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index 0ca952c4354..385b6f1d66c 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -38,9 +38,7 @@ AC_DEFUN([_MYSQL_PLUGIN],[ _MYSQL_PLUGAPPEND([__mysql_plugin_list__],[$1]) m4_define([MYSQL_PLUGIN_NAME_]AS_TR_CPP([$1]), [$3]) m4_define([MYSQL_PLUGIN_DESC_]AS_TR_CPP([$1]), [$4]) - ifelse([$5], [], [], [ - _MYSQL_PLUGAPPEND_META([$1], $5) - ]) + _MYSQL_PLUGAPPEND_META([$1], $5) ]) ]) @@ -351,11 +349,13 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ else m4_ifdef([$7],[ ifelse(m4_bregexp($7, [^lib[^.]+\.a$]), -2, [ +dnl change above "-2" to "0" to enable this section +dnl Although this is "pretty", it breaks libmysqld build m4_ifdef([$6],[ mysql_use_plugin_dir="$6" mysql_plugin_libs="$mysql_plugin_libs -L[\$(top_builddir)]/$6" ]) - mysql_plugin_libs="$mysql_plugin_libs + mysql_plugin_libs="$mysql_plugin_libs dnl [-l]m4_bregexp($7, [^lib\([^.]+\)], [\1])" ], m4_bregexp($7, [^\\\$]), 0, [ m4_ifdef([$6],[ |