From: Florian Forster <octo@noris.net>
Date: Fri, 10 Oct 2008 07:02:33 +0000 (+0200)
Subject: Merge branch 'collectd-4.5'
X-Git-Tag: collectd-4.6.0~178
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=332cf199806de625661fa3a9bf9555f7a47ba9f9

Merge branch 'collectd-4.5'

Conflicts:

	configure.in
---

332cf199806de625661fa3a9bf9555f7a47ba9f9
diff --cc configure.in
index ffaacc3c,c71cfa4e..d416e696
--- a/configure.in
+++ b/configure.in
@@@ -3004,4 -2918,6 +3011,8 @@@ Configuration
  
  EOF
  
+ if test "x$dependency_error" = "xyes"; then
+ 	AC_MSG_ERROR("Some plugins are missing dependencies - see above summary for details")
+ fi
++
 +# vim: set fdm=marker :