Merge branch 'pull/collectd-4.0' into collectd-4.0

[collectd.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9ee8668..ab4d46a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,10 +84,13 @@ if BUILD_MODULE_APACHE
 pkglib_LTLIBRARIES += apache.la
 apache_la_SOURCES = apache.c
 apache_la_LDFLAGS = -module -avoid-version
+apache_la_CFLAGS =
+apache_la_LIBADD =
+collectd_LDADD += "-dlopen" apache.la
 if BUILD_WITH_LIBCURL
-apache_la_LDFLAGS += $(BUILD_WITH_LIBCURL_LIBS)
+apache_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
+apache_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 endif
-collectd_LDADD += "-dlopen" apache.la
 collectd_DEPENDENCIES += apache.la
 endif
 
@@ -352,10 +355,13 @@ if BUILD_MODULE_MYSQL
 pkglib_LTLIBRARIES += mysql.la
 mysql_la_SOURCES = mysql.c
 mysql_la_LDFLAGS = -module -avoid-version
+mysql_la_CFLAGS =
+mysql_la_LIBADD =
+collectd_LDADD += "-dlopen" mysql.la
 if BUILD_WITH_LIBMYSQL
-mysql_la_LDFLAGS += -lmysqlclient
+mysql_la_CFLAGS += $(BUILD_WITH_LIBMYSQL_CFLAGS)
+mysql_la_LIBADD += $(BUILD_WITH_LIBMYSQL_LIBS)
 endif
-collectd_LDADD += "-dlopen" mysql.la
 collectd_DEPENDENCIES += mysql.la
 endif
 
@@ -549,7 +555,10 @@ collectd_LDADD += "-dlopen" wireless.la
 collectd_DEPENDENCIES += wireless.la
 endif
 
-dist_man_MANS = collectd.1 collectd-nagios.1 collectd.conf.5
+dist_man_MANS = collectd.1 collectd-nagios.1 collectd.conf.5 \
+               collectd-email.5 collectd-exec.5 collectd-perl.5 \
+               collectd-unixsock.5
+
 #collectd_1_SOURCES = collectd.pod
 
 EXTRA_DIST = types.db
@@ -568,4 +577,4 @@ install-exec-hook:
        else \
                $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
        fi; \
-       cp -f types.db $(DESTDIR)$(pkglibdir)/;
+       cp -f $(srcdir)/types.db $(DESTDIR)$(pkglibdir)/;