Auto-Merge pull request #3229 from mrunge/cppflags_backport

Automatically merged due to "Automerge" label

diff --git a/configure.ac b/configure.ac
index ac072b0..a1ce009 100644 (file)
--- 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],

diff --git a/src/network.c b/src/network.c
index cf2f811..8acf84b 100644 (file)
--- 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.");
   }