$NetBSD: patch-configure,v 1.10 2015/09/17 11:24:11 he Exp $ Regen from configure.ac. --- configure.orig 2015-09-10 18:56:19.000000000 +0000 +++ configure @@ -797,6 +797,8 @@ BUILD_PLUGIN_NFS_FALSE BUILD_PLUGIN_NFS_TRUE BUILD_PLUGIN_NETWORK_FALSE BUILD_PLUGIN_NETWORK_TRUE +BUILD_PLUGIN_NETSTAT_UDP_FALSE +BUILD_PLUGIN_NETSTAT_UDP_TRUE BUILD_PLUGIN_NETLINK_FALSE BUILD_PLUGIN_NETLINK_TRUE BUILD_PLUGIN_NETAPP_FALSE @@ -1431,6 +1433,7 @@ enable_multimeter enable_mysql enable_netapp enable_netlink +enable_netstat_udp enable_network enable_nfs enable_nginx @@ -2230,6 +2233,7 @@ collectd plugins: --enable-mysql MySQL statistics --enable-netapp NetApp plugin --enable-netlink Enhanced Linux network statistics + --enable-netstat_udp UDP network statistics --enable-network Network communication plugin --enable-nfs NFS statistics --enable-nginx nginx statistics @@ -13908,7 +13912,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -13954,7 +13958,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -13978,7 +13982,7 @@ rm -f core conftest.err conftest.$ac_obj We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -14023,7 +14027,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -14047,7 +14051,7 @@ rm -f core conftest.err conftest.$ac_obj We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -15319,6 +15323,12 @@ $as_echo "#define KERNEL_OPENBSD 1" >>co ac_system="OpenBSD" ;; + *netbsd*) + +$as_echo "#define KERNEL_NETBSD 1" >>confdefs.h + + ac_system="NetBSD" + ;; *aix*) $as_echo "#define KERNEL_AIX 1" >>confdefs.h @@ -15876,6 +15886,29 @@ fi done +# For entropy plugin on newer NetBSD +for ac_header in sys/rndio.h +do : + ac_fn_c_check_header_compile "$LINENO" "sys/rndio.h" "ac_cv_header_sys_rndio_h" "#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_IOCTL_H +# include +#endif +#if HAVE_SYS_PARAM_H +# include +#endif + +" +if test "x$ac_cv_header_sys_rndio_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_RNDIO_H 1 +_ACEOF + +fi + +done + # For ping library for ac_header in netinet/in_systm.h do : @@ -16215,6 +16248,27 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysctl kern.cp_time" >&5 +$as_echo_n "checking for sysctl kern.cp_time... " >&6; } +if test -x /sbin/sysctl +then + /sbin/sysctl kern.cp_times 2>/dev/null + if test $? -eq 0 + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_SYSCTL_KERN_CP_TIME 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + # For hddtemp module for ac_header in linux/major.h @@ -19171,6 +19225,54 @@ else fi +ac_fn_c_check_member "$LINENO" "struct kinfo_proc2" "p_pid" "ac_cv_member_struct_kinfo_proc2_p_pid" " +#include +#include +#include + +" +if test "x$ac_cv_member_struct_kinfo_proc2_p_pid" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_KINFO_PROC2_P_PID 1 +_ACEOF + + + +$as_echo "#define HAVE_STRUCT_KINFO_PROC2_NETBSD 1" >>confdefs.h + + have_struct_kinfo_proc2_netbsd="yes" + +else + + have_struct_kinfo_proc2_netbsd="no" + +fi +ac_fn_c_check_member "$LINENO" "struct kinfo_proc2" "p_uru_maxrss" "ac_cv_member_struct_kinfo_proc2_p_uru_maxrss" " +#include +#include +#include + +" +if test "x$ac_cv_member_struct_kinfo_proc2_p_uru_maxrss" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_KINFO_PROC2_P_URU_MAXRSS 1 +_ACEOF + + + +$as_echo "#define HAVE_STRUCT_KINFO_PROC2_NETBSD 1" >>confdefs.h + + have_struct_kinfo_proc2_netbsd="yes" + +else + + have_struct_kinfo_proc2_netbsd="no" + +fi + + ac_fn_c_check_member "$LINENO" "struct udphdr" "uh_dport" "ac_cv_member_struct_udphdr_uh_dport" "#define _BSD_SOURCE #define _DEFAULT_SOURCE #if HAVE_STDINT_H @@ -27579,6 +27681,7 @@ plugin_load="no" plugin_log_logstash="no" plugin_memory="no" plugin_multimeter="no" +plugin_netstat_udp="no" plugin_nfs="no" plugin_numa="no" plugin_perl="no" @@ -27648,6 +27751,15 @@ then plugin_tcpconns="yes" fi +if test "x$ac_system" = "xNetBSD" +then + plugin_entropy="yes" + plugin_irq="yes" + plugin_processes="yes" + plugin_disk="yes" + plugin_netstat_udp="yes" +fi + # Mac OS X devices if test "x$with_libiokit" = "xyes" then @@ -27890,6 +28002,11 @@ then plugin_swap="yes" fi +if test "x$have_swapctl" = "xyes" && test "x$c_cv_have_swapctl_three_args" = "xyes" +then + plugin_swap="yes" +fi + if test "x$with_kvm_openfiles$with_kvm_nlist" = "xyesyes" then plugin_tcpconns="yes" @@ -31715,6 +31832,66 @@ fi enable_plugin="no" force="no" + # Check whether --enable-netstat_udp was given. +if test "${enable_netstat_udp+set}" = set; then : + enableval=$enable_netstat_udp; + if test "x$enableval" = "xyes" + then + enable_plugin="yes" + else if test "x$enableval" = "xforce" + then + enable_plugin="yes" + force="yes" + else + enable_plugin="no (disabled on command line)" + fi; fi + +else + + if test "x$enable_all_plugins" = "xauto" + then + if test "x$plugin_netstat_udp" = "xyes" + then + enable_plugin="yes" + else + enable_plugin="no" + fi + else + enable_plugin="$enable_all_plugins" + fi + +fi + + if test "x$enable_plugin" = "xyes" + then + if test "x$plugin_netstat_udp" = "xyes" || test "x$force" = "xyes" + then + +$as_echo "#define HAVE_PLUGIN_NETSTAT_UDP 1" >>confdefs.h + + if test "x$plugin_netstat_udp" != "xyes" + then + dependency_warning="yes" + fi + else # User passed "yes" but dependency checking yielded "no" => Dependency problem. + dependency_error="yes" + enable_plugin="no (dependency error)" + fi + fi + if test "x$enable_plugin" = "xyes"; then + BUILD_PLUGIN_NETSTAT_UDP_TRUE= + BUILD_PLUGIN_NETSTAT_UDP_FALSE='#' +else + BUILD_PLUGIN_NETSTAT_UDP_TRUE='#' + BUILD_PLUGIN_NETSTAT_UDP_FALSE= +fi + + enable_netstat_udp="$enable_plugin" + + + + enable_plugin="no" + force="no" # Check whether --enable-network was given. if test "${enable_network+set}" = set; then : enableval=$enable_network; @@ -36781,6 +36958,10 @@ if test -z "${BUILD_PLUGIN_NETLINK_TRUE} as_fn_error $? "conditional \"BUILD_PLUGIN_NETLINK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${BUILD_PLUGIN_NETSTAT_UDP_TRUE}" && test -z "${BUILD_PLUGIN_NETSTAT_UDP_FALSE}"; then + as_fn_error $? "conditional \"BUILD_PLUGIN_NETSTAT_UDP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${BUILD_PLUGIN_NETWORK_TRUE}" && test -z "${BUILD_PLUGIN_NETWORK_FALSE}"; then as_fn_error $? "conditional \"BUILD_PLUGIN_NETWORK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -39602,6 +39783,7 @@ Configuration: mysql . . . . . . . . $enable_mysql netapp . . . . . . . $enable_netapp netlink . . . . . . . $enable_netlink + netstat_udp . . . . . $enable_netstat_udp network . . . . . . . $enable_network nfs . . . . . . . . . $enable_nfs nginx . . . . . . . . $enable_nginx