9b7e662ac9
git-svn-id: svn://svn.openwrt.org/openwrt/packages@24517 3c298f89-4303-0410-b956-a3cf2f4a3e73
23 lines
965 B
Diff
23 lines
965 B
Diff
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -85,7 +85,7 @@ endif
|
|
|
|
if BUILD_WITH_OWN_LIBOCONFIG
|
|
collectd_LDADD += $(LIBLTDL) liboconfig/liboconfig.la
|
|
-collectd_DEPENDENCIES += $(LIBLTDL) liboconfig/liboconfig.la
|
|
+collectd_DEPENDENCIES += liboconfig/liboconfig.la
|
|
else
|
|
collectd_LDADD += -loconfig
|
|
endif
|
|
--- a/src/Makefile.in
|
|
+++ b/src/Makefile.in
|
|
@@ -57,7 +57,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
|
|
@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
|
|
@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
|
|
@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la
|
|
-@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la
|
|
+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la
|
|
@BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
|
|
@BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
|
|
@BUILD_AIX_TRUE@am__append_19 = -lm
|