diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-08-10 09:18:52 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-08-10 09:19:08 +0000 |
commit | a2d7dede737947d7c6afa20a88e1f0c64e0eb96c (patch) | |
tree | fed4aff7dbe0be00cf91de6261d98bc0eb9a2449 /configure.ac | |
parent | Releasing debian version 1.41.0-1. (diff) | |
download | netdata-a2d7dede737947d7c6afa20a88e1f0c64e0eb96c.tar.xz netdata-a2d7dede737947d7c6afa20a88e1f0c64e0eb96c.zip |
Merging upstream version 1.42.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d2f047e6..ac0d7bff 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,12 @@ AC_ARG_ENABLE( [enable_plugin_freeipmi="detect"] ) AC_ARG_ENABLE( + [plugin-systemd-journal], + [AS_HELP_STRING([--enable-plugin-systemd-journal], [enable systemd-journal plugin @<:@default autodetect@:>@])], + , + [enable_plugin_systemd_journal="detect"] +) +AC_ARG_ENABLE( [plugin-cups], [AS_HELP_STRING([--enable-plugin-cups], [enable cups plugin @<:@default autodetect@:>@])], , @@ -1107,6 +1113,39 @@ AM_CONDITIONAL([ENABLE_PLUGIN_FREEIPMI], [test "${enable_plugin_freeipmi}" = "ye # ----------------------------------------------------------------------------- +# systemd-journal.plugin - systemd + +LIBS_BAK="${LIBS}" + +AC_CHECK_LIB([systemd], [sd_journal_open], [have_systemd_libs=yes], [have_systemd_libs=no]) +AC_CHECK_HEADERS([systemd/sd-journal.h], [have_systemd_journal_header=yes], [have_systemd_journal_header=no]) + +if test "${have_systemd_libs}" = "yes" -a "${have_systemd_journal_header}" = "yes"; then + have_systemd="yes" +else + have_systemd="no" +fi + +test "${enable_plugin_systemd_journal}" = "yes" -a "${have_systemd}" != "yes" && \ + AC_MSG_ERROR([systemd is required but not found. Try installing 'libsystemd-dev' or 'libsystemd-devel']) + +AC_MSG_CHECKING([if systemd-journal.plugin should be enabled]) +if test "${enable_plugin_systemd_journal}" != "no" -a "${have_systemd}" = "yes"; then + enable_plugin_systemd_journal="yes" + AC_DEFINE([HAVE_SYSTEMD], [1], [systemd usability]) + OPTIONAL_SYSTEMD_CFLAGS="-I/usr/include" + OPTIONAL_SYSTEMD_LIBS="-lsystemd" +else + enable_plugin_systemd_journal="no" +fi +AC_MSG_RESULT([${enable_plugin_systemd_journal}]) +AM_CONDITIONAL([ENABLE_PLUGIN_SYSTEMD_JOURNAL], [test "${enable_plugin_systemd_journal}" = "yes"]) + +AC_MSG_NOTICE([OPTIONAL_SYSTEMD_LIBS is set to: ${OPTIONAL_SYSTEMD_LIBS}]) + +LIBS="${LIBS_BAK}" + +# ----------------------------------------------------------------------------- # cups.plugin - libcups # Only check most recently added method of cups @@ -1874,6 +1913,7 @@ AC_SUBST([OPTIONAL_GTEST_CFLAGS]) AC_SUBST([OPTIONAL_GTEST_LIBS]) AC_SUBST([OPTIONAL_ML_CFLAGS]) AC_SUBST([OPTIONAL_ML_LIBS]) +AC_SUBST(OPTIONAL_SYSTEMD_LIBS) # ----------------------------------------------------------------------------- # Check if cmocka is available - needed for unit testing @@ -1937,6 +1977,7 @@ AC_CONFIG_FILES([ collectors/tc.plugin/Makefile collectors/xenstat.plugin/Makefile collectors/perf.plugin/Makefile + collectors/systemd-journal.plugin/Makefile daemon/Makefile database/Makefile database/contexts/Makefile @@ -1968,6 +2009,7 @@ AC_CONFIG_FILES([ libnetdata/dictionary/Makefile libnetdata/ebpf/Makefile libnetdata/eval/Makefile + libnetdata/facets/Makefile libnetdata/july/Makefile libnetdata/locks/Makefile libnetdata/log/Makefile |