projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to fix collectd/collectd#229 by doing user / group lookups before we fork.
[collectd.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
26c2355
..
aa01410
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-90,6
+90,7
@@
collectdmon_SOURCES = collectdmon.c
collectdmon_CPPFLAGS = $(AM_CPPFLAGS)
collectd_nagios_SOURCES = collectd-nagios.c
collectdmon_CPPFLAGS = $(AM_CPPFLAGS)
collectd_nagios_SOURCES = collectd-nagios.c
+collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd
collectd_nagios_LDADD =
if BUILD_WITH_LIBSOCKET
collectd_nagios_LDADD += -lsocket
collectd_nagios_LDADD =
if BUILD_WITH_LIBSOCKET
collectd_nagios_LDADD += -lsocket
@@
-103,6
+104,7
@@
collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la
collectdctl_SOURCES = collectdctl.c
collectdctl_SOURCES = collectdctl.c
+collectdctl_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd
collectdctl_LDADD =
if BUILD_WITH_LIBSOCKET
collectdctl_LDADD += -lsocket
collectdctl_LDADD =
if BUILD_WITH_LIBSOCKET
collectdctl_LDADD += -lsocket
@@
-115,10
+117,14
@@
collectdctl_DEPENDENCIES = libcollectdclient/libcollectdclient.la
collectd_tg_SOURCES = collectd-tg.c \
utils_heap.c utils_heap.h
collectd_tg_SOURCES = collectd-tg.c \
utils_heap.c utils_heap.h
+collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd
collectd_tg_LDADD =
if BUILD_WITH_LIBSOCKET
collectd_tg_LDADD += -lsocket
endif
collectd_tg_LDADD =
if BUILD_WITH_LIBSOCKET
collectd_tg_LDADD += -lsocket
endif
+if BUILD_WITH_LIBRT
+collectd_tg_LDADD += -lrt
+endif
if BUILD_AIX
collectd_tg_LDADD += -lm
endif
if BUILD_AIX
collectd_tg_LDADD += -lm
endif
@@
-1369,6
+1375,7
@@
dist_man_MANS = collectd.1 \
collectd-perl.5 \
collectd-python.5 \
collectd-snmp.5 \
collectd-perl.5 \
collectd-python.5 \
collectd-snmp.5 \
+ collectd-tg.1 \
collectd-threshold.5 \
collectd-unixsock.5 \
types.db.5
collectd-threshold.5 \
collectd-unixsock.5 \
types.db.5
@@
-1388,6
+1395,7
@@
EXTRA_DIST += collectd.conf.pod \
collectd-python.pod \
collectd.pod \
collectd-snmp.pod \
collectd-python.pod \
collectd.pod \
collectd-snmp.pod \
+ collectd-tg.pod \
collectd-threshold.pod \
collectd-unixsock.pod \
postgresql_default.conf \
collectd-threshold.pod \
collectd-unixsock.pod \
postgresql_default.conf \
@@
-1410,7
+1418,7
@@
EXTRA_DIST += collectd.conf.pod \
fi
pinba.pb-c.c pinba.pb-c.h: pinba.proto
fi
pinba.pb-c.c pinba.pb-c.h: pinba.proto
- protoc-c -
-c_out .
pinba.proto
+ protoc-c -
I$(srcdir) --c_out . $(srcdir)/
pinba.proto
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)