From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 6 May 2008 14:14:18 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.0~4
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=250dc17bfb3c5488b789347f1f570913701d31ca

Merge branch 'collectd-4.3' into collectd-4.4
---

250dc17bfb3c5488b789347f1f570913701d31ca
diff --cc configure.in
index 08b2ca46,93375237..3876b4f1
--- a/configure.in
+++ b/configure.in
@@@ -2550,9 -2420,10 +2554,10 @@@ f
  AC_SUBST(PERL_BINDINGS)
  AC_SUBST(PERL_BINDINGS_OPTIONS)
  
 -AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
 +AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
  
- if test "x$with_rrdtool" = "xyes" -a "x$librrd_threadsafe" != "xyes"
+ if test "x$with_rrdtool" = "xyes" \
+ 	&& test "x$librrd_threadsafe" != "xyes"
  then
  	with_rrdtool="yes (warning: librrd is not thread-safe)"
  fi