1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for bug#673634:

Browse Source 
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
This commit is contained in:
Sergei Golubchik 2010-11-11 12:02:14 +01:00
parent 9e008bd726
commit 01d41622ba
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/ac-macros/plugins.m4
View File

@ -222,7 +222,7 @@ AC_DEFUN([MYSQL_PLUGIN_WITHOUT],[
if test "X[$with_plugin_]$1" = Xyes; then if test "X[$with_plugin_]$1" = Xyes; then
AC_MSG_ERROR([Plugin $1 cannot be built]) AC_MSG_ERROR([Plugin $1 cannot be built])
else else
[with_plugin_]$1=no [mysql_plugin_]$1=no
fi fi
]) ])
@ -381,6 +381,10 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
__MYSQL_EMIT_CHECK_RESULT($3,[no]) __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, # Plugin is not disabled, determine if it should be built,
# or only distributed # or only distributed
@ -443,7 +447,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
__MYSQL_EMIT_CHECK_RESULT($3,[plugin]) __MYSQL_EMIT_CHECK_RESULT($3,[plugin])
m4_ifdef([$6],[ m4_ifdef([$6],[
else else
[mysql_plugin_]$2=no [with_plugin_]$2=no
__MYSQL_EMIT_CHECK_RESULT($3,[no]) __MYSQL_EMIT_CHECK_RESULT($3,[no])
fi fi
]) ])
@ -769,6 +773,10 @@ AC_DEFUN([_MYSQL_EMIT_PLUGINS],[
]) ])
AC_DEFUN([_MYSQL_EMIT_PLUGIN_ENABLE],[ 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],[ m4_ifdef([$5],m4_ifdef([$4],[
[mysql_plugin_]$2=yes [mysql_plugin_]$2=yes
],[ ],[