From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 6 May 2008 14:13:35 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.4.0~4^2
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=759c544568c019721fe868e7c319bd1471fd501c

Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

	configure.in
---

759c544568c019721fe868e7c319bd1471fd501c
diff --cc configure.in
index 4da57fcc,d9dd13a3..93375237
--- a/configure.in
+++ b/configure.in
@@@ -2418,12 -2227,8 +2422,14 @@@ AC_SUBST(PERL_BINDINGS_OPTIONS
  
  AC_OUTPUT(Makefile src/Makefile src/collectd.conf 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
 +
- if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes"
+ if test "x$with_liboping" = "xyes" \
+ 	&& test "x$with_own_liboping" = "xyes"
  then
  	with_liboping="yes (shipped version)"
  fi