Code

Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 2 Sep 2007 16:15:36 +0000 (18:15 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 2 Sep 2007 16:15:36 +0000 (18:15 +0200)
Conflicts:

contrib/collection.cgi

1  2 
configure.in

diff --cc configure.in
index 567d5426f50154f21069e156b0afb0695994f804,162acd7472d1be0ef9194f8d15e2bfcc1021cc4b..d02c12f6370d128cde079b6b4ff23ac3c2ac1152
@@@ -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)