From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 1 May 2010 07:36:08 +0000 (+0200)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=37676c3b280e15df8efbef2a3dc6c9096d1ae03b;p=collectd.git

Merge branch 'collectd-4.9'

Conflicts:
	configure.in
---

37676c3b280e15df8efbef2a3dc6c9096d1ae03b
diff --cc configure.in
index 32245265,d11c5555..ac07f008
--- a/configure.in
+++ b/configure.in
@@@ -477,7 -477,7 +477,7 @@@ AC_HEADER_TIM
  # Checks for library functions.
  #
  AC_PROG_GCC_TRADITIONAL
- AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog sysconf if_indextoname)
 -AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog sysconf setenv)
++AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog sysconf setenv if_indextoname)
  
  AC_FUNC_STRERROR_R