Merged revision 326 to tags/collectd-3.5.0 and the branches

[collectd.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 879214a26d2e9255aa42b3b654212ebfaeab5b92..6b94389c91faf690ddc12c579aefd3c92ffd7541 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ collectd_SOURCES = collectd.c collectd.h \
                   multicast.c multicast.h \
                   plugin.c plugin.h
 #collectd_CFLAGS = -DPLUGINDIR='"$(pkglibdir)"'
-collectd_CPPFLAGS =
+collectd_CPPFLAGS = $(LTDLINCL)
 collectd_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
 collectd_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
 collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
@@ -50,16 +50,16 @@ collectd_LDADD += "-dlopen" disk.la
 collectd_DEPENDENCIES += disk.la
 endif
 
-if BUILD_MODULE_QUOTA
-pkglib_LTLIBRARIES += quota.la
-quota_la_SOURCES = quota_plugin.c quota_plugin.h
-quota_la_SOURCES += quota_fs.c quota_fs.h
-quota_la_SOURCES += quota_mnt.c quota_mnt.h
-quota_la_LDFLAGS = -module -avoid-version
-quota_la_CFLAGS = -Werror
-collectd_LDADD += "-dlopen" quota.la
-collectd_DEPENDENCIES += quota.la
-endif
+#if BUILD_MODULE_QUOTA
+#pkglib_LTLIBRARIES += quota.la
+#quota_la_SOURCES = quota_plugin.c quota_plugin.h
+#quota_la_SOURCES += quota_fs.c quota_fs.h
+#quota_la_SOURCES += quota_mnt.c quota_mnt.h
+#quota_la_LDFLAGS = -module -avoid-version
+#quota_la_CFLAGS = -Werror
+#collectd_LDADD += "-dlopen" quota.la
+#collectd_DEPENDENCIES += quota.la
+#endif
 
 if BUILD_MODULE_HDDTEMP
 pkglib_LTLIBRARIES += hddtemp.la