wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-09-30 13:02:37 +07:00
Code Issues Packages Projects Releases Wiki Activity

m4: simplify and fix issue with AC_PLUGIN() going out of bounds

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-04-10 16:33:03 +02:00
parent c3ba15045b
commit 1f4acb322a
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
m4/plugin.m4
+19 -23
View File
@@ -1,8 +1,6 @@
# From https://github.com/collectd/collectd/blob/master/configure.ac # From https://github.com/collectd/collectd/blob/master/configure.ac
# Dependency handling currently unused # Dependency handling currently unused
define([toupper], [translit([$1], [a-z], [A-Z])])
define([sanitize], [translit([$1], [-], [_])])
define([enadis], [ifelse([$1], [yes], [disable], [enable])]) define([enadis], [ifelse([$1], [yes], [disable], [enable])])
# AC_PLUGIN(name, default, info) # AC_PLUGIN(name, default, info)
@@ -10,27 +8,25 @@ define([enadis], [ifelse([$1], [yes], [disable], [enable])])
AC_DEFUN([AC_PLUGIN],[ AC_DEFUN([AC_PLUGIN],[
m4_divert_once([HELP_ENABLE], [ m4_divert_once([HELP_ENABLE], [
Optional Plugins:]) Optional Plugins:])
define(PLUGGY, m4_translit([$1],[a-z-][A-Z-]))dnl
AC_ARG_ENABLE([$1-plugin], AS_HELP_STRING([--enadis($2)-$1-plugin], [$3]), [
if test "x$enableval" = "xyes"; then
enable_plugin="yes"
else
enable_plugin="no" enable_plugin="no"
define(pluggy, sanitize($1)) fi], [
define(PLUGGY, toupper(pluggy)) if test "x$enable_all_plugins" = "xauto"; then
AC_ARG_ENABLE([$1-plugin], AS_HELP_STRING([--enadis($2)-$1-plugin], [$3]), [ if test "x$2" = "xyes"; then
if test "x$enableval" = "xyes"; then enable_plugin="yes"
enable_plugin="yes"
else else
enable_plugin="no" enable_plugin="no"
fi], [
if test "x$enable_all_plugins" = "xauto"; then
if test "x$2" = "xyes"; then
enable_plugin="yes"
else
enable_plugin="no"
fi
else
enable_plugin="$enable_all_plugins"
fi])
if test "x$enable_plugin" = "xyes"; then
AC_DEFINE([HAVE_]PLUGGY[_PLUGIN], 1, [Define to 1 if the $1 plugin is enabled.])
plugins="$1 $plugins"
fi fi
AM_CONDITIONAL([BUILD_]PLUGGY[_PLUGIN], test "x$enable_plugin" = "xyes") else
enable_pluggy="$enable_plugin"]) enable_plugin="$enable_all_plugins"
fi])
if test "x$enable_plugin" = "xyes"; then
AC_DEFINE(HAVE_[]m4_translit($1,[-a-z],[_A-Z])_PLUGIN, 1, [Define to 1 if the $1 plugin is enabled.])
plugins="$1 $plugins"
fi
AM_CONDITIONAL(BUILD_[]m4_translit($1,[-a-z],[_A-Z])_PLUGIN, test "x$enable_plugin" = "xyes")])