Merge branch 'ff/avl-tree'

diff --combined src/Makefile.am
index 58cd53c,e0838a1..f4c5464
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,4 -1,4 +1,4 @@@
 -SUBDIRS = libconfig
 +SUBDIRS = liboconfig
  if BUILD_WITH_OWN_LIBOPING
  SUBDIRS += liboping
  endif
@@@ -8,18 -8,17 +8,19 @@@ AM_CFLAGS = -Wall -Werro
  endif
  
  sbin_PROGRAMS = collectd
 +bin_PROGRAMS = collectd-nagios
  
  collectd_SOURCES = collectd.c collectd.h \
                   utils_debug.c utils_debug.h \
+                  utils_avltree.c utils_avltree.h \
                   utils_mount.c utils_mount.h \
 +                 utils_llist.c utils_llist.h \
                   utils_ignorelist.c utils_ignorelist.h \
                   common.c common.h \
 -                 network.c network.h \
                   plugin.c plugin.h \
                   configfile.c configfile.h
  collectd_CPPFLAGS = $(LTDLINCL)
 +collectd_CPPFLAGS += -DPREFIX='"${prefix}"'
  collectd_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
  collectd_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
  if BUILD_FEATURE_DAEMON
@@@ -32,6 -31,9 +33,6 @@@ endi
  
  # Link to these libraries..
  collectd_LDFLAGS = -export-dynamic
 -if BUILD_WITH_RRDTOOL
 -collectd_LDFLAGS += -lm -lrrd
 -endif
  if BUILD_WITH_LIBRT
  collectd_LDFLAGS += -lrt
  endif
@@@ -59,10 -61,8 +60,10 @@@ collectd_LDFLAGS += -lstatgra
  endif
  
  
 -collectd_LDADD = $(LIBLTDL) libconfig/libconfig.la "-dlopen" self
 -collectd_DEPENDENCIES = $(LIBLTDL) libconfig/libconfig.la
 +collectd_LDADD = $(LIBLTDL) liboconfig/liboconfig.la "-dlopen" self
 +collectd_DEPENDENCIES = $(LIBLTDL) liboconfig/liboconfig.la
 +
 +collectd_nagios_SOURCES = collectd-nagios.c
  
  pkglib_LTLIBRARIES = 
  
@@@ -132,14 -132,6 +133,14 @@@ collectd_LDADD += "-dlopen" cpufreq.l
  collectd_DEPENDENCIES += cpufreq.la
  endif
  
 +if BUILD_MODULE_CSV
 +pkglib_LTLIBRARIES += csv.la
 +csv_la_SOURCES = csv.c
 +csv_la_LDFLAGS = -module -avoid-version
 +collectd_LDADD += "-dlopen" csv.la
 +collectd_DEPENDENCIES += csv.la
 +endif
 +
  if BUILD_MODULE_DF
  pkglib_LTLIBRARIES += df.la
  df_la_SOURCES = df.c
@@@ -165,44 -157,6 +166,44 @@@ collectd_LDADD += "-dlopen" disk.l
  collectd_DEPENDENCIES += disk.la
  endif
  
 +if BUILD_MODULE_DNS
 +pkglib_LTLIBRARIES += dns.la
 +dns_la_SOURCES = dns.c
 +if BUILD_WITH_LIBPCAP
 +if BUILD_WITH_LIBPTHREAD
 +dns_la_SOURCES += utils_dns.c utils_dns.h
 +endif
 +endif
 +dns_la_LDFLAGS = -module -avoid-version
 +if BUILD_WITH_LIBPCAP
 +dns_la_LDFLAGS += -lpcap
 +endif
 +if BUILD_WITH_LIBPTHREAD
 +dns_la_LDFLAGS += -lpthread
 +endif
 +collectd_LDADD += "-dlopen" dns.la
 +collectd_DEPENDENCIES += dns.la
 +endif
 +
 +if BUILD_MODULE_EMAIL
 +pkglib_LTLIBRARIES += email.la
 +email_la_SOURCES = email.c
 +email_la_LDFLAGS = -module -avoid-version
 +if BUILD_WITH_LIBPTHREAD
 +email_la_LDFLAGS += -lpthread
 +endif
 +collectd_LDADD += "-dlopen" email.la
 +collectd_DEPENDENCIES += email.la
 +endif
 +
 +if BUILD_MODULE_ENTROPY
 +pkglib_LTLIBRARIES += entropy.la
 +entropy_la_SOURCES = entropy.c
 +entropy_la_LDFLAGS = -module -avoid-version
 +collectd_LDADD += "-dlopen" entropy.la
 +collectd_DEPENDENCIES += entropy.la
 +endif
 +
  #if BUILD_MODULE_QUOTA
  #pkglib_LTLIBRARIES += quota.la
  #quota_la_SOURCES = quota_plugin.c quota_plugin.h
@@@ -242,17 -196,6 +243,17 @@@ load_la_LDFLAGS += -lstatgra
  endif
  endif
  
 +if BUILD_MODULE_MBMON
 +pkglib_LTLIBRARIES += mbmon.la
 +mbmon_la_SOURCES = mbmon.c
 +mbmon_la_LDFLAGS = -module -avoid-version
 +if BUILD_WITH_LIBSOCKET
 +mbmon_la_LDFLAGS += -lsocket
 +endif
 +collectd_LDADD += "-dlopen" mbmon.la
 +collectd_DEPENDENCIES += mbmon.la
 +endif
 +
  if BUILD_MODULE_MEMORY
  pkglib_LTLIBRARIES += memory.la
  memory_la_SOURCES = memory.c
@@@ -295,18 -238,15 +296,18 @@@ collectd_LDADD += "-dlopen" mysql.l
  collectd_DEPENDENCIES += mysql.la
  endif
  
 -if BUILD_MODULE_DNS
 -pkglib_LTLIBRARIES += dns.la
 -dns_la_SOURCES = dns.c utils_dns.c
 -dns_la_LDFLAGS = -module -avoid-version
 -if BUILD_WITH_LIBPCAP
 -dns_la_LDFLAGS += -lpcap
 +if BUILD_MODULE_NETWORK
 +pkglib_LTLIBRARIES += network.la
 +network_la_SOURCES = network.c
 +network_la_LDFLAGS = -module -avoid-version
 +if BUILD_WITH_LIBSOCKET
 +network_la_LDFLAGS += -lsocket
  endif
 -collectd_LDADD += "-dlopen" dns.la
 -collectd_DEPENDENCIES += dns.la
 +if BUILD_WITH_LIBPTHREAD
 +network_la_LDFLAGS += -lpthread
 +endif
 +collectd_LDADD += "-dlopen" network.la
 +collectd_DEPENDENCIES += network.la
  endif
  
  if BUILD_MODULE_NFS
@@@ -352,14 -292,6 +353,14 @@@ collectd_LDADD += "-dlopen" processes.l
  collectd_DEPENDENCIES += processes.la
  endif
  
 +if BUILD_WITH_RRDTOOL
 +pkglib_LTLIBRARIES += rrdtool.la
 +rrdtool_la_SOURCES = rrdtool.c
 +rrdtool_la_LDFLAGS = -module -avoid-version -lrrd
 +collectd_LDADD += "-dlopen" rrdtool.la
 +collectd_DEPENDENCIES += rrdtool.la
 +endif
 +
  if BUILD_MODULE_SENSORS
  pkglib_LTLIBRARIES += sensors.la
  sensors_la_SOURCES = sensors.c
@@@ -439,17 -371,6 +440,17 @@@ traffic_la_LDFLAGS += -lstatgra
  endif
  endif
  
 +if BUILD_MODULE_UNIXSOCK
 +pkglib_LTLIBRARIES += unixsock.la
 +unixsock_la_SOURCES = unixsock.c
 +unixsock_la_LDFLAGS = -module -avoid-version
 +if BUILD_WITH_LIBPTHREAD
 +unixsock_la_LDFLAGS += -lpthread
 +endif
 +collectd_LDADD += "-dlopen" unixsock.la
 +collectd_DEPENDENCIES += unixsock.la
 +endif
 +
  if BUILD_MODULE_USERS
  pkglib_LTLIBRARIES += users.la
  users_la_SOURCES = users.c