blob: 6496890a7cae7089d458b678f4eb84a8e1761f74 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
diff -r -u collectd-4.10.1.orig/src/Makefile.am collectd-4.10.1/src/Makefile.am
--- collectd-4.10.1.orig/src/Makefile.am 2010-07-09 12:01:59.000000000 +0200
+++ collectd-4.10.1/src/Makefile.am 2010-10-11 00:10:59.000000000 +0200
@@ -1,7 +1,4 @@
SUBDIRS = libcollectdclient
-if BUILD_WITH_OWN_LIBIPTC
-SUBDIRS += owniptc
-endif
if BUILD_WITH_OWN_LIBOCONFIG
SUBDIRS += liboconfig
endif
@@ -415,12 +412,9 @@
iptables_la_SOURCES = iptables.c
iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS)
-if BUILD_WITH_OWN_LIBIPTC
-iptables_la_LIBADD = owniptc/libiptc.la
-iptables_la_DEPENDENCIES = owniptc/libiptc.la
-else
+
iptables_la_LIBADD = -liptc
-endif
+
collectd_LDADD += "-dlopen" iptables.la
collectd_DEPENDENCIES += iptables.la
endif
|
GitWeb
