X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdaemon%2FMakefile.am;h=9a0ba8f92ffcda84e01b0d5aaa06a761797cfeab;hp=fbe4e30f2ddcc15caff95e028b310a3c807148c5;hb=865f2eb31e8264edd9337bc63ac59f6c2fa3b5a7;hpb=dcb67fd746e550f73f4db4db2e2b24ff9788f209 diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index fbe4e30f..9a0ba8f9 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -23,9 +23,6 @@ endif if BUILD_WITH_LIBSOCKET COMMON_LIBS += -lsocket endif -if BUILD_WITH_LIBRESOLV -COMMON_LIBS += -lresolv -endif if BUILD_WITH_LIBKSTAT COMMON_LIBS += -lkstat endif @@ -81,12 +78,8 @@ collectd_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) collectd_LDADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) endif -if BUILD_WITH_OWN_LIBOCONFIG collectd_LDADD += $(top_builddir)/src/liboconfig/liboconfig.la collectd_DEPENDENCIES += $(top_builddir)/src/liboconfig/liboconfig.la -else -collectd_LDADD += -loconfig -endif LOG_COMPILER = env VALGRIND="@VALGRIND@" $(abs_top_srcdir)/testwrapper.sh