From 139d11d172e1bba79fa1611838b548c50366f08f Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Tue, 23 Jul 2019 13:11:03 +0200 Subject: [PATCH 1/2] Fix typo in src/network.c (cherry picked from commit 262212d3e5db97743c9ff47897778a84049e4bae) --- src/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network.c b/src/network.c index cf2f811405..8acf84b1bb 100644 --- a/src/network.c +++ b/src/network.c @@ -381,7 +381,7 @@ static bool check_send_notify_okay(const notification_t *n) /* {{{ */ LOG_ERR, &complain_forwarding, "network plugin: A notification has been received via the network " "and forwarding is enabled. Forwarding of notifications is currently " - "not supported, because there is not loop-deteciton available. " + "not supported, because there is not loop-detection available. " "Please contact the collectd mailing list if you need this " "feature."); } From f4fa18f660da282231d35e88ca871bdfba3b4c4d Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Mon, 8 Jul 2019 13:23:18 +0200 Subject: [PATCH 2/2] Fix bug that leads to CPPFLAGS gets overridden with CFLAGS when libxxms is enabled (cherry picked from commit e4c981472890655a5113d5b3bd643f62f19d0139) --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac072b0224..a1ce009ae9 100644 --- a/configure.ac +++ b/configure.ac @@ -5771,7 +5771,7 @@ if test "x$with_libxmms" = "xyes"; then fi if test "x$with_libxmms" = "xyes"; then - SAVE_CPPFLAGS="$CFLAGS" + SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$with_xmms_cflags" AC_CHECK_HEADER([xmmsctrl.h],