Code

Merge branch 'collectd-4.5'
authorFlorian Forster <octo@noris.net>
Fri, 10 Oct 2008 07:02:33 +0000 (09:02 +0200)
committerFlorian Forster <octo@noris.net>
Fri, 10 Oct 2008 07:02:33 +0000 (09:02 +0200)
Conflicts:

configure.in

1  2 
README
configure.in

diff --cc README
Simple merge
diff --cc configure.in
index ffaacc3c306ba3c75064913927d2cffb7c07f3d6,c71cfa4ef20bbef51b794077047b60256f8c63b3..d416e696eeee7c990416cfcddd82cab317dd5ebe
@@@ -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 :