Merge branch 'ff/nginx'

Conflicts:

	configure.in
	src/Makefile.am

diff --cc configure.in
index 4dc04b0,ce8698b..48b4e62
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1964,12 -1124,9 +1964,13 @@@ Configuration
      memory  . . . . . . $enable_memory
      multimeter  . . . . $enable_multimeter
      mysql . . . . . . . $enable_mysql
 +    netlink . . . . . . $enable_netlink
 +    network . . . . . . $enable_network
      nfs . . . . . . . . $enable_nfs
+     nginx . . . . . . . $enable_nginx
      ntpd  . . . . . . . $enable_ntpd
 +    nut . . . . . . . . $enable_nut
 +    perl  . . . . . . . $enable_perl
      ping  . . . . . . . $enable_ping
      processes . . . . . $enable_processes
      sensors . . . . . . $enable_sensors

diff --cc src/Makefile.am
index 15e1708,85c5f58..24cdf3f
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -389,7 -286,18 +389,18 @@@ collectd_LDADD += "-dlopen" nfs.l
  collectd_DEPENDENCIES += nfs.la
  endif
  
 -if BUILD_MODULE_NGINX
++if BUILD_PLUGIN_NGINX
+ pkglib_LTLIBRARIES += nginx.la
+ nginx_la_SOURCES = nginx.c
+ nginx_la_LDFLAGS = -module -avoid-version
+ if BUILD_WITH_LIBCURL
+ nginx_la_LDFLAGS += $(BUILD_WITH_LIBCURL_LIBS)
+ endif
+ collectd_LDADD += "-dlopen" nginx.la
+ collectd_DEPENDENCIES += nginx.la
+ endif
+ 
 -if BUILD_MODULE_NTPD
 +if BUILD_PLUGIN_NTPD
  pkglib_LTLIBRARIES += ntpd.la
  ntpd_la_SOURCES = ntpd.c
  ntpd_la_LDFLAGS = -module -avoid-version