diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-11 12:02:14 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-11 12:02:14 +0100 |
| commit | 01d41622ba4cdb99327f98d0d1c1772ad842c66a (patch) | |
| tree | 4a2c423de163c21ea3e7fa6939bbe16d28bd50d0 /config | |
| parent | 9e008bd7261028cdac77ef995c68cba749e473e3 (diff) | |
| download | mariadb-git-01d41622ba4cdb99327f98d0d1c1772ad842c66a.tar.gz | |
fix for bug#673634:
better MYSQL_PLUGIN_WITHOUT that works correctly in all of the following:
--with-plugin-XXX
--without-plugin-XXX
--with-plugins=XXX
--with-plugins=META
--with-plugins=XXX --without-plugin-XXX
--with-plugins=META --without-plugin-XXX
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/plugins.m4 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index cfc70d188a9..c6bb907d5e1 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -222,7 +222,7 @@ AC_DEFUN([MYSQL_PLUGIN_WITHOUT],[ if test "X[$with_plugin_]$1" = Xyes; then AC_MSG_ERROR([Plugin $1 cannot be built]) else - [with_plugin_]$1=no + [mysql_plugin_]$1=no fi ]) @@ -381,6 +381,10 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ __MYSQL_EMIT_CHECK_RESULT($3,[no]) ],[ + if test "X[$mysql_plugin_]$2" = Xno; then + [with_plugin_]$2=no + fi + # Plugin is not disabled, determine if it should be built, # or only distributed @@ -443,7 +447,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ __MYSQL_EMIT_CHECK_RESULT($3,[plugin]) m4_ifdef([$6],[ else - [mysql_plugin_]$2=no + [with_plugin_]$2=no __MYSQL_EMIT_CHECK_RESULT($3,[no]) fi ]) @@ -769,6 +773,10 @@ AC_DEFUN([_MYSQL_EMIT_PLUGINS],[ ]) AC_DEFUN([_MYSQL_EMIT_PLUGIN_ENABLE],[ + if test "X[$mysql_plugin_]$2" = Xno -a \ + "X[$with_plugin_]$2" != Xno; then + AC_MSG_ERROR([Plugin $1 cannot be built]) + fi m4_ifdef([$5],m4_ifdef([$4],[ [mysql_plugin_]$2=yes ],[ |