From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 17 Sep 2009 08:58:19 +0000 (+0200)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.1~10
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9fcc56456620f6f5663e7b2ca2168d612dc6bd6c;hp=0384380080a39adb252a4d5dd3a6bf5c27f8faf8;p=collectd.git

Merge branch 'collectd-4.7' into collectd-4.8
---

diff --git a/configure.in b/configure.in
index a58002a0..a898d742 100644
--- a/configure.in
+++ b/configure.in
@@ -1467,29 +1467,32 @@ SAVE_CPPFLAGS="$CPPFLAGS"
 SAVE_LDFLAGS="$LDFLAGS"
 CPPFLAGS="$CPPFLAGS $LIBIPTC_CPPFLAGS"
 LDFLAGS="$LDFLAGS $LIBIPTC_LDFLAGS"
-if test "x$with_libiptc" = "xyes"
+# check whether the header file for libiptc is available.
+if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
 then
-	AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h, [],
+	AC_CHECK_HEADERS(libiptc/libiptc.h,
 	[
-		with_libiptc="no (Linux iptables headers not found)"
-		with_own_libiptc="no"
+		AC_DEFINE(HAVE_LIBIPTC_LIBIPTC_H, 1, [Define to 1 if you have the <libiptc/libiptc.h> header file.])
 	],
 	[
-#include "$srcdir/src/owniptc/ipt_kernel_headers.h"
+		with_libiptc="yes"
+		with_own_libiptc="yes"
 	])
-
 fi
 if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
 then
-	AC_CHECK_HEADERS(libiptc/libiptc.h,
+	AC_CHECK_HEADERS(libiptc/libip6tc.h,
 	[
-		AC_DEFINE(HAVE_LIBIPTC_LIBIPTC_H, 1, [Define to 1 if you have the <libiptc/libiptc.h> header file.])
+		AC_DEFINE(HAVE_LIBIPTC_LIBIP6TC_H, 1, [Define to 1 if you have the <libiptc/libip6tc.h> header file.])
 	],
 	[
 		with_libiptc="yes"
 		with_own_libiptc="yes"
 	])
 fi
+# If the header file is available, check for the required type declaractions.
+# They may be missing in old versions of libiptc. In that case, they will be
+# declared in the iptables plugin.
 if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
 then
 	AC_CHECK_TYPES([iptc_handle_t, ip6tc_handle_t], [], [],
@@ -1503,6 +1506,7 @@ then
 #endif
 	])
 fi
+# Check for the iptc_init symbol in the library.
 if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
 then
 	AC_CHECK_LIB(iptc, iptc_init,
@@ -1514,6 +1518,19 @@ then
 		with_own_libiptc="yes"
 	])
 fi
+# The system wide version failed for some reason. Check if we have the required
+# headers to build the shipped version.
+if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xyes"
+then
+	AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h linux/netfilter/x_tables.h, [],
+	[
+		with_libiptc="no (Linux iptables headers not found)"
+		with_own_libiptc="no"
+	],
+	[
+#include "$srcdir/src/owniptc/ipt_kernel_headers.h"
+	])
+fi
 AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
 AM_CONDITIONAL(BUILD_WITH_OWN_LIBIPTC, test "x$with_own_libiptc" = "xyes")
 if test "x$with_libiptc" = "xyes"