X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=d0bf5463d125b58b83d461b347961ff25e0a3208;hb=243a7d0ee8150608f33f796065638fd3766e03a7;hp=5c53b90f8ccaa2de7714f3aca5ff89f45f3c7238;hpb=1d7fbcf1832d4a9887a0bc7dca1896564adeca67;p=collectd.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 5c53b90f..d0bf5463 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,10 +6,6 @@ SUBDIRS += daemon
 
 PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>'
 
-if COMPILER_IS_GCC
-AM_CFLAGS = -Wall -Werror
-endif
-
 AM_CPPFLAGS = -I$(srcdir)/daemon
 AM_CPPFLAGS += -DPREFIX='"${prefix}"'
 AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
@@ -41,6 +37,9 @@ check_PROGRAMS += test_utils_vl_lookup
 TESTS += test_utils_vl_lookup
 test_utils_vl_lookup_SOURCES = utils_vl_lookup_test.c testing.h
 test_utils_vl_lookup_LDADD = liblookup.la daemon/libcommon.la daemon/libplugin_mock.la
+if BUILD_WITH_LIBKSTAT
+test_utils_vl_lookup_LDADD += -lkstat
+endif
 
 noinst_LTLIBRARIES += libmount.la
 libmount_la_SOURCES = utils_mount.c utils_mount.h
@@ -48,7 +47,9 @@ check_PROGRAMS += test_utils_mount
 TESTS += test_utils_mount
 test_utils_mount_SOURCES = utils_mount_test.c testing.h
 test_utils_mount_LDADD = libmount.la daemon/libcommon.la daemon/libplugin_mock.la
-
+if BUILD_WITH_LIBKSTAT
+test_utils_mount_LDADD += -lkstat
+endif
 
 sbin_PROGRAMS = collectdmon
 bin_PROGRAMS = collectd-nagios collectdctl collectd-tg
@@ -340,7 +341,7 @@ if BUILD_WITH_LIBUDEV
 disk_la_LIBADD += -ludev
 endif
 if BUILD_FREEBSD
-disk_la_LIBADD += -ldevstat -lkvm -lgeom -lbsdxml -lsbuf
+disk_la_LIBADD += -ldevstat -lgeom
 endif
 if BUILD_WITH_PERFSTAT
 disk_la_LIBADD += -lperfstat