[Commits] Rev 2860: MYSQL_PLUGIN_WITHOUT() macro for plug.in in http://bazaar.launchpad.net/~maria-captains/maria/5.2/

serg at askmonty.org serg at askmonty.org
Mon Sep 13 21:33:50 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2860
revision-id: sergii at pisem.net-20100913183152-eighgzfb7h9qx279
parent: sergii at pisem.net-20100913165350-qn6zeiqrcheg2eg1
fixes bug(s): https://launchpad.net/bugs/635633
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Mon 2010-09-13 20:31:52 +0200
message:
  MYSQL_PLUGIN_WITHOUT() macro for plug.in
  Using it in oqgraph/plug.in to fix bug#635633
-------------- next part --------------
=== modified file 'config/ac-macros/plugins.m4'
--- a/config/ac-macros/plugins.m4	2010-04-01 14:34:51 +0000
+++ b/config/ac-macros/plugins.m4	2010-09-13 18:31:52 +0000
@@ -203,6 +203,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
 dnl SYNOPSIS

=== modified file 'storage/oqgraph/plug.in'
--- a/storage/oqgraph/plug.in	2010-05-15 08:44:55 +0000
+++ b/storage/oqgraph/plug.in	2010-09-13 18:31:52 +0000
@@ -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()



More information about the commits mailing list