projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.9' into collectd-4.10
[collectd.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
13a1f9d
..
75ac706
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-4030,7
+4030,7
@@
then
plugin_vserver="yes"
plugin_wireless="yes"
plugin_vserver="yes"
plugin_wireless="yes"
- if test "x$have_net_ip_vs_h" = "xyes"
-o
"x$have_ip_vs_h" = "xyes"
+ if test "x$have_net_ip_vs_h" = "xyes"
|| test
"x$have_ip_vs_h" = "xyes"
then
plugin_ipvs="yes"
fi
then
plugin_ipvs="yes"
fi
@@
-4500,7
+4500,7
@@
then
with_librrd="yes (warning: librrd is not thread-safe)"
fi
with_librrd="yes (warning: librrd is not thread-safe)"
fi
-if test "x$with_libiptc" = "xyes"
-a
"x$with_own_libiptc" = "xyes"
+if test "x$with_libiptc" = "xyes"
&& test
"x$with_own_libiptc" = "xyes"
then
with_libiptc="yes (shipped version)"
fi
then
with_libiptc="yes (shipped version)"
fi