From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 2 Sep 2007 16:15:36 +0000 (+0200)
Subject: Merge branch 'collectd-4.0' into collectd-4.1
X-Git-Tag: collectd-4.1.1~13
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0f0dd3b00845209b865862c073813caf44d01ae8;p=collectd.git

Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

	contrib/collection.cgi
---

0f0dd3b00845209b865862c073813caf44d01ae8
diff --cc configure.in
index 567d5426,162acd74..d02c12f6
--- a/configure.in
+++ b/configure.in
@@@ -363,8 -418,14 +363,10 @@@ AC_HEADER_TIM
  # Checks for library functions.
  #
  AC_PROG_GCC_TRADITIONAL
 -AC_CHECK_FUNCS(gettimeofday select strdup strtol)
 -AC_CHECK_FUNCS(getaddrinfo getnameinfo)
 -AC_CHECK_FUNCS(strchr memcpy strstr strcmp strncmp strncpy strlen)
 -AC_CHECK_FUNCS(strncasecmp strcasecmp)
 -AC_CHECK_FUNCS(openlog syslog closelog)
 +AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog)
  
+ AC_FUNC_STRERROR_R
+ 
  AC_CHECK_FUNCS(getpwnam_r)
  AC_CHECK_FUNCS(getgrnam_r)