Merge branch 'ff/snmp' into collectd-4.10

[collectd.git] / configure.in

diff --git a/configure.in b/configure.in
index 58c9d279c20c1022c511260f3162c7960602fa63..39a99eadc0f3c061ea96d0052a2253aaf4ebf177 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1043,6 +1043,7 @@ AC_CHECK_MEMBERS([struct kinfo_proc.ki_pid, struct kinfo_proc.ki_rssize, struct
                have_struct_kinfo_proc_freebsd="no"
        ],
        [
+AC_INCLUDES_DEFAULT
 #include <kvm.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -1059,6 +1060,7 @@ AC_CHECK_MEMBERS([struct kinfo_proc.kp_proc, struct kinfo_proc.kp_eproc],
                have_struct_kinfo_proc_openbsd="no"
        ],
        [
+AC_INCLUDES_DEFAULT
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <kvm.h>
@@ -1653,10 +1655,12 @@ fi
 # This could be in iptc or ip4tc
 if test "x$with_libiptc" = "xpkgconfig"
 then
+       SAVE_LIBS="$LIBS"
        AC_SEARCH_LIBS(iptc_init, [iptc ip4tc],
                        [with_libiptc="pkgconfig"],
                        [with_libiptc="no"],
                        [$with_libiptc_libs])
+       LIBS="$SAVE_LIBS"
 fi
 if test "x$with_libiptc" = "xpkgconfig"
 then
@@ -2201,6 +2205,8 @@ then
                AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
                                [
 AC_INCLUDES_DEFAULT
+#include <asm/types.h>
+#include <sys/socket.h>
 #if HAVE_LIBNETLINK_H
 # include <libnetlink.h>
 #elif HAVE_IPROUTE_LIBNETLINK_H
@@ -2226,6 +2232,8 @@ return 0;
                AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
                                [
 AC_INCLUDES_DEFAULT
+#include <asm/types.h>
+#include <sys/socket.h>
 #if HAVE_LIBNETLINK_H
 # include <libnetlink.h>
 #elif HAVE_IPROUTE_LIBNETLINK_H
@@ -2664,7 +2672,7 @@ AM_CONDITIONAL(BUILD_WITH_LIBPCAP, test "x$with_libpcap" = "xyes")
 perl_interpreter="perl"
 AC_ARG_WITH(libperl, [AS_HELP_STRING([--with-libperl@<:@=PREFIX@:>@], [Path to libperl.])],
 [
-       if test -x "$withval"
+       if test -f "$withval" && test -x "$withval"
        then
                perl_interpreter="$withval"
                with_libperl="yes"