Merge pull request #518 from pyr/feature-riemann-threshold

Feature riemann threshold

diff --cc src/Makefile.am
index 8720adfd7a6a156fc61b32a0569fca4929a77593,8060029ab36310d58df45adab79a01766f547b00..566260a82183dfb5c3c48043a0e1a8f053597855
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -382,12 -384,9 +384,12 @@@ if BUILD_WITH_LIBIOKI
  disk_la_LDFLAGS += -framework IOKit
  endif
  if BUILD_WITH_LIBSTATGRAB
- disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS)  
+ disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
  disk_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
  endif
 +if BUILD_WITH_LIBUDEV
 +disk_la_LIBADD += -ludev
 +endif
  if BUILD_WITH_PERFSTAT
  disk_la_LIBADD += -lperfstat
  endif

diff --cc src/collectd.conf.pod
Simple merge