Browse Source

MYSQL_PLUGIN_WITHOUT() macro for plug.in

Using it in oqgraph/plug.in to fix bug#635633
pull/843/head
Sergei Golubchik 15 years ago
parent
commit
422c136658
  1. 24
      config/ac-macros/plugins.m4
  2. 2
      storage/oqgraph/plug.in

24
config/ac-macros/plugins.m4

@ -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 Macro: MYSQL_PLUGIN_DEPENDS
dnl

2
storage/oqgraph/plug.in

@ -35,6 +35,6 @@ AC_PREPROC_IFELSE(
],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
with_plugin_oqgraph=no])
MYSQL_PLUGIN_WITHOUT(oqgraph)])
AC_LANG_POP()
Loading…
Cancel
Save