projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5' into collectd-5.6
[collectd.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
25d7bd4
..
37160c1
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-170,6
+170,7
@@
apache_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
apache_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
endif
apache_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
endif
+
if BUILD_PLUGIN_APCUPS
pkglib_LTLIBRARIES += apcups.la
apcups_la_SOURCES = apcups.c
if BUILD_PLUGIN_APCUPS
pkglib_LTLIBRARIES += apcups.la
apcups_la_SOURCES = apcups.c
@@
-574,6
+575,15
@@
lpar_la_LDFLAGS = $(PLUGIN_LDFLAGS)
lpar_la_LIBADD = -lperfstat
endif
lpar_la_LIBADD = -lperfstat
endif
+if BUILD_PLUGIN_LUA
+pkglib_LTLIBRARIES += lua.la
+lua_la_SOURCES = lua.c \
+ utils_lua.c utils_lua.h
+lua_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBLUA_CFLAGS)
+lua_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+lua_la_LIBADD = $(BUILD_WITH_LIBLUA_LIBS)
+endif
+
if BUILD_PLUGIN_LVM
pkglib_LTLIBRARIES += lvm.la
lvm_la_SOURCES = lvm.c
if BUILD_PLUGIN_LVM
pkglib_LTLIBRARIES += lvm.la
lvm_la_SOURCES = lvm.c
@@
-1241,7
+1251,6
@@
pkglib_LTLIBRARIES += write_graphite.la
write_graphite_la_SOURCES = write_graphite.c \
utils_format_graphite.c utils_format_graphite.h
write_graphite_la_LDFLAGS = $(PLUGIN_LDFLAGS)
write_graphite_la_SOURCES = write_graphite.c \
utils_format_graphite.c utils_format_graphite.h
write_graphite_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-write_graphite_la_LIBADD = libformat_json.la
endif
if BUILD_PLUGIN_WRITE_HTTP
endif
if BUILD_PLUGIN_WRITE_HTTP
@@
-1354,6
+1363,7
@@
dist_man_MANS = collectd.1 \
collectd-exec.5 \
collectdctl.1 \
collectd-java.5 \
collectd-exec.5 \
collectdctl.1 \
collectd-java.5 \
+ collectd-lua.5 \
collectdmon.1 \
collectd-nagios.1 \
collectd-perl.5 \
collectdmon.1 \
collectd-nagios.1 \
collectd-perl.5 \
@@
-1369,6
+1379,7
@@
EXTRA_DIST = collectd.conf.pod \
collectd-exec.pod \
collectdctl.pod \
collectd-java.pod \
collectd-exec.pod \
collectdctl.pod \
collectd-java.pod \
+ collectd-lua.pod \
collectdmon.pod \
collectd-nagios.pod \
collectd-perl.pod \
collectdmon.pod \
collectd-nagios.pod \
collectd-perl.pod \