From: Florian Forster Date: Tue, 14 Jul 2015 07:00:49 +0000 (+0200) Subject: Link libcommon.la with $(COMMON_LIBS). X-Git-Tag: collectd-5.5.2~11 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=deb62277abc42463d6762d4fb58e1e7df2994b6b;p=collectd.git Link libcommon.la with $(COMMON_LIBS). This hopefully fixes link errors on Solaris: CCLD test_utils_vl_lookup Undefined first referenced symbol in file kstat_data_lookup daemon/.libs/libcommon.a(common.o) kstat_lookup daemon/.libs/libcommon.a(common.o) kstat_read daemon/.libs/libcommon.a(common.o) getaddrinfo daemon/.libs/libcommon.a(common.o) freeaddrinfo daemon/.libs/libcommon.a(common.o) gai_strerror daemon/.libs/libcommon.a(common.o) ld: fatal: symbol referencing errors. No output written to test_utils_vl_lookup collect2: error: ld returned 1 exit status (cherry picked from commit fe2eee98f4b1cf8c5a5df6ed6cd03d8487c695be) Conflicts: src/daemon/Makefile.am --- diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 95fb947a..877d6b75 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -46,10 +46,12 @@ noinst_LTLIBRARIES = libavltree.la libcommon.la libheap.la libplugin_mock.la libavltree_la_SOURCES = utils_avltree.c utils_avltree.h libcommon_la_SOURCES = common.c common.h +libcommon_la_LIBADD = $(COMMON_LIBS) libheap_la_SOURCES = utils_heap.c utils_heap.h libplugin_mock_la_SOURCES = plugin_mock.c utils_cache_mock.c utils_time_mock.c +libplugin_mock_la_LIBADD = $(COMMON_LIBS) collectd_SOURCES = collectd.c collectd.h \ configfile.c configfile.h \ @@ -94,7 +96,7 @@ check_PROGRAMS = test_common test_utils_avltree test_utils_heap TESTS = test_common test_utils_avltree test_utils_heap test_common_SOURCES = common_test.c ../testing.h -test_common_LDADD = libcommon.la libplugin_mock.la $(COMMON_LIBS) +test_common_LDADD = libcommon.la libplugin_mock.la test_utils_avltree_SOURCES = utils_avltree_test.c ../testing.h test_utils_avltree_LDADD = libavltree.la $(COMMON_LIBS)