Merge branch 'master' into ff/netlib

Conflicts:
	src/collectdctl.c

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd-nagios.c
index b805c762b17f7e1ee0fb62444b96e7c93c06e32f,b3c1855aba2be7d98a3c112b62b5ddbebe33f609..2d59ea77c25f239a9e4c8ea2a97971ac7d83c7b1
--- 1/src/collectd-nagios.c
--- 2/src/collectd-nagios.c
+++ b/src/collectd-nagios.c
@@@ -34,40 -46,10 +46,10 @@@
  #include <string.h>
  #include <strings.h>
  #include <assert.h>
- 
- #include <sys/socket.h>
- #include <sys/un.h>
+ #include <math.h>
  
 -#include "libcollectdclient/client.h"
 +#include "libcollectdclient/collectd/client.h"
  
- /*
-  * This is copied directly from collectd.h. Make changes there!
-  */
- #if NAN_STATIC_DEFAULT
- # include <math.h>
- /* #endif NAN_STATIC_DEFAULT*/
- #elif NAN_STATIC_ISOC
- # ifndef __USE_ISOC99
- #  define DISABLE_ISOC99 1
- #  define __USE_ISOC99 1
- # endif /* !defined(__USE_ISOC99) */
- # include <math.h>
- # if DISABLE_ISOC99
- #  undef DISABLE_ISOC99
- #  undef __USE_ISOC99
- # endif /* DISABLE_ISOC99 */
- /* #endif NAN_STATIC_ISOC */
- #elif NAN_ZERO_ZERO
- # include <math.h>
- # ifdef NAN
- #  undef NAN
- # endif
- # define NAN (0.0 / 0.0)
- # ifndef isnan
- #  define isnan(f) ((f) != (f))
- # endif /* !defined(isnan) */
- #endif /* NAN_ZERO_ZERO */
- 
  #define RET_OKAY     0
  #define RET_WARNING  1
  #define RET_CRITICAL 2

diff --cc src/collectdctl.c
index 81ed7b19d53d95593361b8f9a7d20c7a21e25dcd,e1091cc6467a5669d4e9aee2e2d5dfa30d9ff730..f16a70dd94285861bc5d8bac19debfc66a4f74f0
--- 1/src/collectdctl.c
--- 2/src/collectdctl.c
+++ b/src/collectdctl.c
@@@ -25,21 -25,30 +25,30 @@@
  # include "config.h"
  #endif
  
- #include "libcollectdclient/collectd/client.h"
+ #ifndef _ISOC99_SOURCE
+ # define _ISOC99_SOURCE
+ #endif
  
- #include <assert.h>
+ #ifndef _POSIX_C_SOURCE
+ # define _POSIX_C_SOURCE 200112L
+ #endif
  
- #include <errno.h>
+ #ifndef _XOPEN_SOURCE
+ # define _XOPEN_SOURCE 600
+ #endif
  
- #include <getopt.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <strings.h>
  
+ #include <assert.h>
+ #include <errno.h>
  #include <math.h>
  
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
 -#include "libcollectdclient/client.h"
++#include "libcollectdclient/collectd/client.h"
  
- #include <unistd.h>
  
  #define DEFAULT_SOCK LOCALSTATEDIR"/run/"PACKAGE_NAME"-unixsock"