Merge pull request #1737 from rubenk/pthread-cleanup

Pthread cleanup

diff --combined configure.ac
index 8232a0e,ea819ec..7d5c292
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1603,45 -1603,21 +1603,21 @@@ if test "x$with_libhal" = "xyes"; the
        fi
  fi
  
- # --with-libpthread {{{
- AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Path to libpthread.])],
- [     if test "x$withval" != "xno" \
-               && test "x$withval" != "xyes"
-       then
-               LDFLAGS="$LDFLAGS -L$withval/lib"
-               CPPFLAGS="$CPPFLAGS -I$withval/include"
-               with_libpthread="yes"
-       else
-               if test "x$withval" = "xno"
-               then
-                       with_libpthread="no (disabled)"
-               fi
-       fi
- ], [with_libpthread="yes"])
+ SAVE_LIBS="$LIBS"
+ AC_CHECK_LIB([pthread],
+   [pthread_create],
+   [],
+   [AC_MSG_ERROR([Symbol 'pthread_create' not found in libpthread"])],
+   []
+ )
+ PTHREAD_LIBS="$LIBS"
+ LIBS="$SAVE_LIBS"
  
+ AC_CHECK_HEADERS([pthread.h],
+   [],
+   [AC_MSG_ERROR([pthread.h not found])]
+ )
  AC_SUBST([PTHREAD_LIBS])
- if test "x$with_libpthread" = "xyes"
- then
-       SAVE_LIBS="$LIBS"
-       AC_CHECK_LIB(pthread, pthread_create, [], [with_libpthread="no (Symbol 'pthread_create' not found)"], [])
-       PTHREAD_LIBS="$LIBS"
-       LIBS="$SAVE_LIBS"
- fi
- 
- if test "x$with_libpthread" = "xyes"
- then
-       AC_CHECK_HEADERS(pthread.h,, [with_libpthread="no (pthread.h not found)"])
- fi
- if test "x$with_libpthread" = "xyes"
- then
-       collect_pthread=1
- else
-       collect_pthread=0
- fi
- AC_DEFINE_UNQUOTED(HAVE_LIBPTHREAD, [$collect_pthread],
-       [Wether or not to use pthread (POSIX threads) library])
- AM_CONDITIONAL(BUILD_WITH_LIBPTHREAD, test "x$with_libpthread" = "xyes")
- # }}}
  
  m4_divert_once([HELP_WITH], [
  collectd additional packages:])
@@@ -1956,6 -1932,7 +1932,6 @@@ the
                AC_DEFINE(HAVE_CURLOPT_TIMEOUT_MS, 1, [Define if libcurl supports CURLOPT_TIMEOUT_MS option.])
        fi
  fi
 -AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes")
  # }}}
  
  # --with-libdbi {{{
@@@ -3365,9 -3342,9 +3341,9 @@@ the
  fi
  if test "x$with_oracle" = "xyes"
  then
 -      BUILD_WITH_ORACLE_CFLAGS="$with_oracle_cppflags"
 +      BUILD_WITH_ORACLE_CPPFLAGS="$with_oracle_cppflags"
        BUILD_WITH_ORACLE_LIBS="$with_oracle_libs"
 -      AC_SUBST(BUILD_WITH_ORACLE_CFLAGS)
 +      AC_SUBST(BUILD_WITH_ORACLE_CPPFLAGS)
        AC_SUBST(BUILD_WITH_ORACLE_LIBS)
  fi
  # }}}
@@@ -4774,10 -4751,6 +4750,10 @@@ the
  
        CPPFLAGS="$SAVE_CPPFLAGS"
        LDFLAGS="$SAVE_LDFLAGS"
 +      LIBXENCTL_CPPFLAGS="$with_libxenctl_cppflags"
 +      LIBXENCTL_LDFLAGS="$with_libxenctl_ldflags"
 +      AC_SUBST(LIBXENCTL_CPPFLAGS)
 +      AC_SUBST(LIBXENCTL_LDFLAGS)
  fi
  
  # --with-libxmms {{{
@@@ -5853,7 -5826,6 +5829,7 @@@ AC_PLUGIN([battery],             [$plug
  AC_PLUGIN([bind],                [$plugin_bind],            [ISC Bind nameserver statistics])
  AC_PLUGIN([ceph],                [$plugin_ceph],            [Ceph daemon statistics])
  AC_PLUGIN([cgroups],             [$plugin_cgroups],         [CGroups CPU usage accounting])
 +AC_PLUGIN([chrony],              [yes],                     [Chrony statistics])
  AC_PLUGIN([conntrack],           [$plugin_conntrack],       [nf_conntrack statistics])
  AC_PLUGIN([contextswitch],       [$plugin_contextswitch],   [context switch statistics])
  AC_PLUGIN([cpu],                 [$plugin_cpu],             [CPU usage statistics])
@@@ -6215,7 -6187,6 +6191,6 @@@ Configuration
      libperfstat . . . . . $with_perfstat
      libperl . . . . . . . $with_libperl
      libpq . . . . . . . . $with_libpq
-     libpthread  . . . . . $with_libpthread
      librabbitmq . . . . . $with_librabbitmq
      libriemann-client . . $with_libriemann_client
      librdkafka  . . . . . $with_librdkafka
@@@ -6257,7 -6228,6 +6232,7 @@@
      bind  . . . . . . . . $enable_bind
      ceph  . . . . . . . . $enable_ceph
      cgroups . . . . . . . $enable_cgroups
 +    chrony. . . . . . . . $enable_chrony
      conntrack . . . . . . $enable_conntrack
      contextswitch . . . . $enable_contextswitch
      cpu . . . . . . . . . $enable_cpu

diff --combined src/Makefile.am
index 1bf3961,19a1fb1..bf0c62b
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -55,9 -55,7 +55,9 @@@ bin_PROGRAMS = collectd-nagios collectd
  collectdmon_SOURCES = collectdmon.c
  
  collectd_nagios_SOURCES = collectd-nagios.c
 -collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd
 +collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) \
 +      -I$(top_srcdir)/src/libcollectdclient/collectd \
 +      -I$(top_builddir)/src/libcollectdclient/collectd
  collectd_nagios_LDADD = libcollectdclient/libcollectdclient.la
  if BUILD_WITH_LIBSOCKET
  collectd_nagios_LDADD += -lsocket
@@@ -68,9 -66,7 +68,9 @@@ endi
  
  
  collectdctl_SOURCES = collectdctl.c
 -collectdctl_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd
 +collectdctl_CPPFLAGS = $(AM_CPPFLAGS) \
 +      -I$(top_srcdir)/src/libcollectdclient/collectd \
 +      -I$(top_builddir)/src/libcollectdclient/collectd
  collectdctl_LDADD = libcollectdclient/libcollectdclient.la
  if BUILD_WITH_LIBSOCKET
  collectdctl_LDADD += -lsocket
@@@ -82,9 -78,9 +82,10 @@@ endi
  
  collectd_tg_SOURCES = collectd-tg.c
  collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) \
 -                     -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd
 +      -I$(top_srcdir)/src/libcollectdclient/collectd \
 +      -I$(top_builddir)/src/libcollectdclient/collectd
  collectd_tg_LDADD = \
+       $(PTHREAD_LIBS) \
        daemon/libheap.la \
        libcollectdclient/libcollectdclient.la
  if BUILD_WITH_LIBSOCKET
@@@ -96,9 -92,6 +97,6 @@@ endi
  if BUILD_AIX
  collectd_tg_LDADD += -lm
  endif
- if BUILD_WITH_LIBPTHREAD
- collectd_tg_LDADD += $(PTHREAD_LIBS)
- endif
  
  
  pkglib_LTLIBRARIES =
@@@ -130,8 -123,12 +128,8 @@@ if BUILD_PLUGIN_APACH
  pkglib_LTLIBRARIES += apache.la
  apache_la_SOURCES = apache.c
  apache_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -apache_la_CFLAGS = $(AM_CFLAGS)
 -apache_la_LIBADD =
 -if BUILD_WITH_LIBCURL
 -apache_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 -apache_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 -endif
 +apache_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 +apache_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
  endif
  
  if BUILD_PLUGIN_APCUPS
@@@ -147,15 -144,16 +145,15 @@@ endi
  if BUILD_PLUGIN_APPLE_SENSORS
  pkglib_LTLIBRARIES += apple_sensors.la
  apple_sensors_la_SOURCES = apple_sensors.c
 -apple_sensors_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -apple_sensors_la_LDFLAGS += -framework IOKit
 +apple_sensors_la_LDFLAGS = $(PLUGIN_LDFLAGS) -framework IOKit
  endif
  
  if BUILD_PLUGIN_AQUAERO
  pkglib_LTLIBRARIES += aquaero.la
  aquaero_la_SOURCES = aquaero.c
 -aquaero_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  aquaero_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBAQUAERO5_CFLAGS)
 -aquaero_la_LIBADD = $(BUILD_WITH_LIBAQUAERO5_LDFLAGS) -laquaero5
 +aquaero_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBAQUAERO5_LDFLAGS)
 +aquaero_la_LIBADD = -laquaero5
  endif
  
  if BUILD_PLUGIN_ASCENT
@@@ -208,12 -206,6 +206,12 @@@ cgroups_la_LDFLAGS = $(PLUGIN_LDFLAGS
  cgroups_la_LIBADD = libmount.la
  endif
  
 +if BUILD_PLUGIN_CHRONY
 +pkglib_LTLIBRARIES += chrony.la
 +chrony_la_SOURCES = chrony.c
 +chrony_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +endif
 +
  if BUILD_PLUGIN_CONNTRACK
  pkglib_LTLIBRARIES += conntrack.la
  conntrack_la_SOURCES = conntrack.c
@@@ -267,17 -259,25 +265,17 @@@ if BUILD_PLUGIN_CUR
  pkglib_LTLIBRARIES += curl.la
  curl_la_SOURCES = curl.c
  curl_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -curl_la_CFLAGS = $(AM_CFLAGS)
 -curl_la_LIBADD =
 -if BUILD_WITH_LIBCURL
 -curl_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 -curl_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 -endif
 +curl_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 +curl_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
  endif
  
  if BUILD_PLUGIN_CURL_JSON
  pkglib_LTLIBRARIES += curl_json.la
  curl_json_la_SOURCES = curl_json.c
 -curl_json_la_CFLAGS = $(AM_CFLAGS)
 -curl_json_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 +curl_json_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
  curl_json_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
 -curl_json_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
 -if BUILD_WITH_LIBCURL
 -curl_json_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 -curl_json_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 -endif
 +curl_json_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 +curl_json_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBYAJL_LIBS)
  endif
  
  if BUILD_PLUGIN_CURL_XML
@@@ -341,7 -341,7 +339,7 @@@ if BUILD_PLUGIN_DN
  pkglib_LTLIBRARIES += dns.la
  dns_la_SOURCES = dns.c utils_dns.c utils_dns.h
  dns_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- dns_la_LIBADD = $(PTHREAD_LIBS) -lpcap
+ dns_la_LIBADD = -lpcap
  endif
  
  if BUILD_PLUGIN_DRBD
@@@ -354,7 -354,6 +352,6 @@@ if BUILD_PLUGIN_EMAI
  pkglib_LTLIBRARIES += email.la
  email_la_SOURCES = email.c
  email_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- email_la_LIBADD = $(PTHREAD_LIBS)
  endif
  
  if BUILD_PLUGIN_ENTROPY
@@@ -370,7 -369,6 +367,6 @@@ exec_la_SOURCES = exec.c 
                  utils_cmd_putval.c utils_cmd_putval.h \
                  utils_parse_option.h utils_parse_option.c
  exec_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- exec_la_LIBADD = $(PTHREAD_LIBS)
  endif
  
  if BUILD_PLUGIN_ETHSTAT
@@@ -434,6 -432,7 +430,6 @@@ endif # BUILD_PLUGIN_INTERFAC
  if BUILD_PLUGIN_IPC
  pkglib_LTLIBRARIES += ipc.la
  ipc_la_SOURCES = ipc.c
 -ipc_la_CFLAGS = $(AM_CFLAGS)
  ipc_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
  
@@@ -456,9 -455,10 +452,9 @@@ endi
  if BUILD_PLUGIN_IPVS
  pkglib_LTLIBRARIES += ipvs.la
  ipvs_la_SOURCES = ipvs.c
 -if IP_VS_H_NEEDS_KERNEL_CFLAGS
 -ipvs_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS)
 -else
  ipvs_la_CFLAGS = $(AM_CFLAGS)
 +if IP_VS_H_NEEDS_KERNEL_CFLAGS
 +ipvs_la_CFLAGS += $(KERNEL_CFLAGS)
  endif
  ipvs_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
@@@ -475,7 -475,7 +471,7 @@@ java_la_SOURCES = java.
  java_la_CPPFLAGS = $(AM_CPPFLAGS) $(JAVA_CPPFLAGS)
  java_la_CFLAGS = $(AM_CFLAGS) $(JAVA_CFLAGS)
  java_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(JAVA_LDFLAGS)
- java_la_LIBADD = $(PTHREAD_LIBS) $(JAVA_LIBS)
+ java_la_LIBADD = $(JAVA_LIBS)
  endif
  
  if BUILD_PLUGIN_LOAD
@@@ -502,6 -502,7 +498,6 @@@ endi
  if BUILD_PLUGIN_LOG_LOGSTASH
  pkglib_LTLIBRARIES += log_logstash.la
  log_logstash_la_SOURCES = log_logstash.c
 -log_logstash_la_CFLAGS = $(AM_CFLAGS)
  log_logstash_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
  log_logstash_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
  log_logstash_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
@@@ -517,8 -518,7 +513,8 @@@ endi
  if BUILD_PLUGIN_LVM
  pkglib_LTLIBRARIES += lvm.la
  lvm_la_SOURCES = lvm.c
 -lvm_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +lvm_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBLVM2APP_CPPFLAGS)
 +lvm_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBLVM2APP_LDFLAGS)
  lvm_la_LIBADD = $(BUILD_WITH_LIBLVM2APP_LIBS)
  endif
  
@@@ -646,9 -646,13 +642,9 @@@ endi
  if BUILD_PLUGIN_MYSQL
  pkglib_LTLIBRARIES += mysql.la
  mysql_la_SOURCES = mysql.c
 +mysql_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMYSQL_CFLAGS)
  mysql_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -mysql_la_CFLAGS = $(AM_CFLAGS)
 -mysql_la_LIBADD =
 -if BUILD_WITH_LIBMYSQL
 -mysql_la_CFLAGS += $(BUILD_WITH_LIBMYSQL_CFLAGS)
 -mysql_la_LIBADD += $(BUILD_WITH_LIBMYSQL_LIBS)
 -endif
 +mysql_la_LIBADD = $(BUILD_WITH_LIBMYSQL_LIBS)
  endif
  
  if BUILD_PLUGIN_NETAPP
@@@ -673,7 -677,7 +669,7 @@@ network_la_SOURCES = network.c network.
                     utils_fbhash.c utils_fbhash.h
  network_la_CPPFLAGS = $(AM_CPPFLAGS)
  network_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- network_la_LIBADD = $(PTHREAD_LIBS)
+ network_la_LIBADD =
  if BUILD_WITH_LIBSOCKET
  network_la_LIBADD += -lsocket
  endif
@@@ -699,9 -703,13 +695,9 @@@ endi
  if BUILD_PLUGIN_NGINX
  pkglib_LTLIBRARIES += nginx.la
  nginx_la_SOURCES = nginx.c
 -nginx_la_CFLAGS = $(AM_CFLAGS)
 -nginx_la_LIBADD =
 +nginx_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
  nginx_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -if BUILD_WITH_LIBCURL
 -nginx_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 -nginx_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 -endif
 +nginx_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
  endif
  
  if BUILD_PLUGIN_NOTIFY_DESKTOP
@@@ -716,7 -724,7 +712,7 @@@ if BUILD_PLUGIN_NOTIFY_EMAI
  pkglib_LTLIBRARIES += notify_email.la
  notify_email_la_SOURCES = notify_email.c
  notify_email_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- notify_email_la_LIBADD = $(PTHREAD_LIBS) -lesmtp -lssl -lcrypto
+ notify_email_la_LIBADD = -lesmtp -lssl -lcrypto
  endif
  
  if BUILD_PLUGIN_NOTIFY_NAGIOS
@@@ -746,7 -754,7 +742,7 @@@ pkglib_LTLIBRARIES += nut.l
  nut_la_SOURCES = nut.c
  nut_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBUPSCLIENT_CFLAGS)
  nut_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- nut_la_LIBADD = $(PTHREAD_LIBS) $(BUILD_WITH_LIBUPSCLIENT_LIBS)
+ nut_la_LIBADD = $(BUILD_WITH_LIBUPSCLIENT_LIBS)
  endif
  
  if BUILD_PLUGIN_OLSRD
@@@ -762,6 -770,7 +758,6 @@@ endi
  if BUILD_PLUGIN_ONEWIRE
  pkglib_LTLIBRARIES += onewire.la
  onewire_la_SOURCES = onewire.c
 -onewire_la_CFLAGS = $(AM_CFLAGS)
  onewire_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOWCAPI_CPPFLAGS)
  onewire_la_LIBADD = $(BUILD_WITH_LIBOWCAPI_LIBS)
  onewire_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBOWCAPI_LDFLAGS)
@@@ -770,14 -779,15 +766,14 @@@ endi
  if BUILD_PLUGIN_OPENLDAP
  pkglib_LTLIBRARIES += openldap.la
  openldap_la_SOURCES = openldap.c
 -openldap_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBLDAP_LDFLAGS)
 -openldap_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBLDAP_CPPFLAGS)
 +openldap_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBLDAP_CPPFLAGS)
 +openldap_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBLDAP_LDFLAGS)
  openldap_la_LIBADD = -lldap
  endif
  
  if BUILD_PLUGIN_OPENVPN
  pkglib_LTLIBRARIES += openvpn.la
  openvpn_la_SOURCES = openvpn.c
 -openvpn_la_CFLAGS = $(AM_CFLAGS)
  openvpn_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
  
@@@ -785,7 -795,8 +781,7 @@@ if BUILD_PLUGIN_ORACL
  pkglib_LTLIBRARIES += oracle.la
  oracle_la_SOURCES = oracle.c \
        utils_db_query.c utils_db_query.h
 -oracle_la_CFLAGS = $(AM_CFLAGS)
 -oracle_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_ORACLE_CFLAGS)
 +oracle_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_ORACLE_CPPFLAGS)
  oracle_la_LIBADD = $(BUILD_WITH_ORACLE_LIBS)
  oracle_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
@@@ -949,16 -960,13 +945,13 @@@ if BUILD_WITH_LIBNETSNM
  snmp_la_CFLAGS += $(BUILD_WITH_LIBSNMP_CFLAGS)
  snmp_la_LIBADD += $(BUILD_WITH_LIBSNMP_LIBS)
  endif
- if BUILD_WITH_LIBPTHREAD
- snmp_la_LIBADD += $(PTHREAD_LIBS)
- endif
  endif
  
  if BUILD_PLUGIN_STATSD
  pkglib_LTLIBRARIES += statsd.la
  statsd_la_SOURCES = statsd.c
  statsd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- statsd_la_LIBADD = $(PTHREAD_LIBS) liblatency.la -lm
+ statsd_la_LIBADD = liblatency.la -lm
  endif
  
  if BUILD_PLUGIN_SWAP
@@@ -1109,7 -1117,6 +1102,6 @@@ unixsock_la_SOURCES = unixsock.c 
                      utils_cmd_putnotif.h utils_cmd_putnotif.c \
                      utils_parse_option.h utils_parse_option.c
  unixsock_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- unixsock_la_LIBADD = $(PTHREAD_LIBS)
  endif
  
  if BUILD_PLUGIN_UPTIME
@@@ -1193,9 -1200,13 +1185,9 @@@ if BUILD_PLUGIN_WRITE_HTT
  pkglib_LTLIBRARIES += write_http.la
  write_http_la_SOURCES = write_http.c \
                        utils_format_json.c utils_format_json.h
 +write_http_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
  write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -write_http_la_CFLAGS = $(AM_CFLAGS)
 -write_http_la_LIBADD =
 -if BUILD_WITH_LIBCURL
 -write_http_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 -write_http_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 -endif
 +write_http_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
  endif
  
  if BUILD_PLUGIN_WRITE_KAFKA
@@@ -1229,7 -1240,7 +1221,7 @@@ if BUILD_PLUGIN_WRITE_REDI
  pkglib_LTLIBRARIES += write_redis.la
  write_redis_la_SOURCES = write_redis.c
  write_redis_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBHIREDIS_LDFLAGS)
 -write_redis_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBHIREDIS_CPPFLAGS)
 +write_redis_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBHIREDIS_CPPFLAGS)
  write_redis_la_LIBADD = -lhiredis
  endif
  
@@@ -1255,8 -1266,7 +1247,8 @@@ endi
  if BUILD_PLUGIN_XENCPU
  pkglib_LTLIBRARIES += xencpu.la
  xencpu_la_SOURCES = xencpu.c
 -xencpu_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +xencpu_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBXENCTL_CPPFLAGS)
 +xencpu_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBXENCTL_LDFLAGS)
  xencpu_la_LIBADD = -lxenctrl
  endif
  
@@@ -1271,12 -1281,17 +1263,12 @@@ endi
  if BUILD_PLUGIN_ZFS_ARC
  pkglib_LTLIBRARIES += zfs_arc.la
  zfs_arc_la_SOURCES = zfs_arc.c
 -zfs_arc_la_CFLAGS = $(AM_CFLAGS)
  zfs_arc_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  if BUILD_FREEBSD
  zfs_arc_la_LIBADD = -lm
 -else
 -if BUILD_LINUX
 -# zfs_arc requires no library on linux
 -else
 -# solaris
 -zfs_arc_la_LIBADD = -lkstat
  endif
 +if BUILD_SOLARIS
 +zfs_arc_la_LIBADD = -lkstat
  endif
  endif
  
@@@ -1291,6 -1306,7 +1283,6 @@@ BUILT_SOURCES += $(dist_man_MANS
  if BUILD_PLUGIN_ZONE
  pkglib_LTLIBRARIES += zone.la
  zone_la_SOURCES = zone.c
 -zone_la_CFLAGS = $(AM_CFLAGS)
  zone_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
  
@@@ -1310,7 -1326,11 +1302,7 @@@ dist_man_MANS = collectd.1 
                collectd-unixsock.5 \
                types.db.5
  
 -#collectd_1_SOURCES = collectd.pod
 -
 -EXTRA_DIST = types.db
 -
 -EXTRA_DIST +=   collectd.conf.pod \
 +EXTRA_DIST =  collectd.conf.pod \
                collectd-email.pod \
                collectd-exec.pod \
                collectdctl.pod \
@@@ -1325,7 -1345,6 +1317,7 @@@
                collectd-threshold.pod \
                collectd-unixsock.pod \
                postgresql_default.conf \
 +              types.db \
                types.db.pod
  
  .pod.1: