mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
auto-include plug.in, remove the need for plugins to modify configure.in
This commit is contained in:
parent
17b46953ca
commit
376117eb98
4 changed files with 31 additions and 13 deletions
|
|
@ -249,7 +249,6 @@ AC_DEFUN([MYSQL_PLUGIN_ACTIONS],[
|
|||
])
|
||||
])
|
||||
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Macro: MYSQL_CONFIGURE_PLUGINS
|
||||
dnl
|
||||
|
|
@ -267,6 +266,10 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[
|
|||
AC_FATAL([cannot use [MYSQL_CONFIGURE_PLUGINS] multiple times])
|
||||
],[
|
||||
m4_define([__mysql_plugin_configured__],[done])
|
||||
_MYSQL_INCLUDE_LIST(
|
||||
m4_bpatsubst(m4_esyscmd([ls plugin/*/plug.in storage/*/plug.in 2>/dev/null]),
|
||||
[[
|
||||
]],[,]))
|
||||
m4_ifdef([__mysql_plugin_list__],[
|
||||
_MYSQL_CHECK_PLUGIN_ARGS([$1])
|
||||
_MYSQL_CONFIGURE_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
|
||||
|
|
@ -730,4 +733,21 @@ _MYSQL_EMIT_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
|
|||
_MYSQL_EMIT_PLUGIN_DEPENDS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Macro: _MYSQL_INCLUDE_LIST
|
||||
dnl
|
||||
dnl SYNOPSIS
|
||||
dnl _MYSQL_INCLUDE_LIST([filename,filename...])
|
||||
dnl
|
||||
dnl DESCRIPTION
|
||||
dnl includes all files from the list
|
||||
dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_DEFUN([_MYSQL_INCLUDE_LIST],[
|
||||
ifelse([$1], [], [], [
|
||||
sinclude($1)
|
||||
_MYSQL_INCLUDE_LIST(m4_shift($@))
|
||||
])
|
||||
])
|
||||
|
||||
dnl ===========================================================================
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue