Merge branches 'ff/dns' and 'sh/email' into next

Conflicts:

	configure.in
	src/Makefile.am

diff --cc configure.in
index 52a8cef,69c6aa9,823845a..f57dd18
--- 1/configure.in
--- 2/configure.in
--- 3/configure.in
+++ b/configure.in
@@@@ -272,12 -272,18 -282,6 +282,17 @@@@ AC_CHECK_HEADERS(grp.h
   # For debugging interface (variable number of arguments)
   AC_CHECK_HEADERS(stdarg.h)
   
-  AC_CHECK_HEADERS(arpa/nameser.h)
  +# Regular expressions for the ignorelist.
  +AC_CHECK_HEADERS(regex.h)
  +
  +# For the dns plugin
 - AC_CHECK_HEADERS(arpa/nameser.h)
+ +AC_CHECK_HEADERS(arpa/nameser.h arpa/nameser_compat.h)
+ +
+ +AC_CHECK_HEADERS(net/if_arp.h)
+ +AC_CHECK_HEADERS(net/if_ppp.h)
+ +AC_CHECK_HEADERS(netinet/if_ether.h)
+ +AC_CHECK_HEADERS(netinet/udp.h)
  +
   dnl Checking for libraries
   AC_CHECK_LIB(m, ext)
   
@@@@ -965,7 -976,7 -963,7 +985,8 @@@@ AC_COLLECTD([cpu],       [disable], [mo
   AC_COLLECTD([cpufreq],   [disable], [module], [system cpu frequency statistics])
   AC_COLLECTD([disk],      [disable], [module], [disk/partition statistics])
   AC_COLLECTD([df],        [disable], [module], [df statistics])
  +AC_COLLECTD([dns],       [disable], [module], [dns statistics])
++ AC_COLLECTD([email],     [disable], [module], [email statistics])
   AC_COLLECTD([quota],     [enable],  [module], [quota statistics (experimental)])
   AC_COLLECTD([hddtemp],   [disable], [module], [hdd temperature statistics])
   AC_COLLECTD([load],      [disable], [module], [system load statistics])
@@@@ -999,7 -1010,8 -997,7 +1020,9 @@@@ Configuration
       libstatgrab . . . . $with_libstatgrab
       libkstat  . . . . . $with_kstat
       libmysql  . . . . . $with_libmysql
++     regex . . . . . . . $with_regex
  +    libpcap . . . . . . $with_libpcap
+ +    libpthread  . . . . $with_libpthread
   
     Features:
       debug . . . . . . . $enable_debug
@@@@ -1016,7 -1028,7 -1014,7 +1039,8 @@@@
       cpufreq . . . . . . $enable_cpufreq
       df  . . . . . . . . $enable_df
       disk  . . . . . . . $enable_disk
  +    dns . . . . . . . . $enable_dns
++     email . . . . . . . $enable_email
       hddtemp . . . . . . $enable_hddtemp
       load  . . . . . . . $enable_load
       memory  . . . . . . $enable_memory

diff --cc src/Makefile.am
index 5cd0e28,1269369,6f0ca0a..9e9b466
--- 1/src/Makefile.am
--- 2/src/Makefile.am
--- 3/src/Makefile.am
+++ b/src/Makefile.am
@@@@ -156,6 -156,20 -156,14 +156,28 @@@@ collectd_LDADD += "-dlopen" disk.l
   collectd_DEPENDENCIES += disk.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
+ +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 -lpthread
++ collectd_LDADD += "-dlopen" email.la
++ collectd_DEPENDENCIES += email.la
++ endif
++ 
   #if BUILD_MODULE_QUOTA
   #pkglib_LTLIBRARIES += quota.la
   #quota_la_SOURCES = quota_plugin.c quota_plugin.h