From: Florian Forster <octo@collectd.org>
Date: Sun, 11 Nov 2012 07:58:18 +0000 (+0100)
Subject: Merge branch 'ff/aggregate'
X-Git-Tag: collectd-5.2.0~24
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=b22ffd9cb1938b4931d7628420a9f0b50461333f

Merge branch 'ff/aggregate'

Conflicts:
	src/Makefile.am
---

b22ffd9cb1938b4931d7628420a9f0b50461333f
diff --cc src/Makefile.am
index 5bfe930a,9d528c11..f4c699a3
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1393,7 -1395,15 +1403,20 @@@ install-exec-hook
  	$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
  		$(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
  
 +uninstall-hook:
 +	rm -f $(DESTDIR)$(pkgdatadir)/types.db;
 +	rm -f $(DESTDIR)$(sysconfdir)/collectd.conf
 +	rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
++
+ if BUILD_FEATURE_DEBUG
+ bin_PROGRAMS += utils_vl_lookup_test
+ utils_vl_lookup_test_SOURCES = utils_vl_lookup_test.c \
+                                utils_vl_lookup.h utils_vl_lookup.c \
+                                utils_avltree.c utils_avltree.h \
+                                common.h
+ 
+ utils_vl_lookup_test_CPPFLAGS =  $(AM_CPPFLAGS) $(LTDLINCL) -DBUILD_TEST=1
+ utils_vl_lookup_test_CFLAGS = $(AM_CFLAGS)
+ utils_vl_lookup_test_LDFLAGS = -export-dynamic
+ utils_vl_lookup_test_LDADD =
+ endif