projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
connectivity plugin initial commit
[collectd.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
d9ea739
..
3ff2189
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-6480,18
+6480,15
@@
if test "x$ac_system" = "xLinux"; then
if test "x$with_libyajl" = "xyes" && test "x$with_libyajl2" = "xyes"; then
plugin_ovs_events="yes"
plugin_ovs_stats="yes"
if test "x$with_libyajl" = "xyes" && test "x$with_libyajl2" = "xyes"; then
plugin_ovs_events="yes"
plugin_ovs_stats="yes"
-<<<<<<< HEAD
plugin_procevent="yes"
plugin_procevent="yes"
- fi
-
- if test "x$have_pci_regs_h" = "xyes"; then
- plugin_pcie_errors="yes"
-=======
if test "x$with_libmnl" = "xyes"; then
plugin_connectivity="yes"
fi
if test "x$with_libmnl" = "xyes"; then
plugin_connectivity="yes"
fi
->>>>>>> connectivity notifications
+ fi
+
+ if test "x$have_pci_regs_h" = "xyes"; then
+ plugin_pcie_errors="yes"
fi
fi
fi
fi