Commit 5f472022 authored by Sergei Golubchik's avatar Sergei Golubchik

MYSQL_PLUGIN_WITHOUT() macro for plug.in

Using it in oqgraph/plug.in to fix bug#635633
parent 4d5f4151
...@@ -202,6 +202,30 @@ AC_DEFUN([_MYSQL_PLUGIN_DISABLED],[ ...@@ -202,6 +202,30 @@ AC_DEFUN([_MYSQL_PLUGIN_DISABLED],[
]) ])
dnl ---------------------------------------------------------------------------
dnl Macro: MYSQL_PLUGIN_WITHOUT
dnl
dnl SYNOPSIS
dnl MYSQL_PLUGIN_WITHOUT([name])
dnl
dnl DESCRIPTION
dnl Exclude the plugin from being built, as if --without-plugin-name
dnl was specified.
dnl If the plugin was selected manually by --with-plugin-name,
dnl excluding it here will abort the configure script with an error,
dnl otherwise plugin will be silently disabled.
dnl
dnl ---------------------------------------------------------------------------
AC_DEFUN([MYSQL_PLUGIN_WITHOUT],[
MYSQL_REQUIRE_PLUGIN([$1])
if test "X[$with_plugin_]$1" = Xyes; then
AC_MSG_ERROR([Plugin $1 cannot be built])
else
[with_plugin_]$1=no
fi
])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Macro: MYSQL_PLUGIN_DEPENDS dnl Macro: MYSQL_PLUGIN_DEPENDS
dnl dnl
......
...@@ -35,6 +35,6 @@ AC_PREPROC_IFELSE( ...@@ -35,6 +35,6 @@ AC_PREPROC_IFELSE(
], ],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
with_plugin_oqgraph=no]) MYSQL_PLUGIN_WITHOUT(oqgraph)])
AC_LANG_POP() AC_LANG_POP()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment