[gentoo-commits] gentoo-x86 commit in app-admin/collectd/files: collectd-4.10.1-noowniptc.patch

[gentoo-commits] gentoo-x86 commit in app-admin/collectd/files: collectd-4.10.1-noowniptc.patch

[Andreas HAttel (dilfridge)]

dilfridge    10/10/12 17:59:52

  Added:                collectd-4.10.1-noowniptc.patch
  Log:
  Real fix for bug 340109: use libiptc only if needed and fully disable bundled copy
  
  (Portage version: 2.1.9.14/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-admin/collectd/files/collectd-4.10.1-noowniptc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch?rev=1.1&content-type=text/plain

Index: collectd-4.10.1-noowniptc.patch
===================================================================
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