head 1.12; access; symbols pkgsrc-2016Q3:1.11.0.6 pkgsrc-2016Q3-base:1.11 pkgsrc-2016Q2:1.11.0.4 pkgsrc-2016Q2-base:1.11 pkgsrc-2016Q1:1.11.0.2 pkgsrc-2016Q1-base:1.11 pkgsrc-2015Q4:1.10.0.4 pkgsrc-2015Q4-base:1.10 pkgsrc-2015Q3:1.10.0.2 pkgsrc-2015Q3-base:1.10 pkgsrc-2015Q1:1.1.0.10 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.8 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.6 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.4 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.2 pkgsrc-2014Q1-base:1.1; locks; strict; comment @# @; 1.12 date 2016.10.13.15.17.28; author fhajny; state dead; branches; next 1.11; commitid RWJ8bw294oCzPZpz; 1.11 date 2016.02.03.13.10.27; author he; state Exp; branches; next 1.10; commitid JpnXSoZX7vMEftTy; 1.10 date 2015.09.17.11.24.11; author he; state Exp; branches; next 1.9; commitid lc5e5tKTfgM79BBy; 1.9 date 2015.09.12.19.04.56; author he; state Exp; branches; next 1.8; commitid XssISl4eMlqbPZAy; 1.8 date 2015.09.01.09.00.04; author he; state Exp; branches; next 1.7; commitid hovbxf8iFFsnRwzy; 1.7 date 2015.08.26.12.19.27; author he; state Exp; branches; next 1.6; commitid wrT49f9UG8gP9Myy; 1.6 date 2015.08.18.07.47.46; author he; state Exp; branches; next 1.5; commitid zLfcP5U7WuVFTIxy; 1.5 date 2015.08.14.15.39.28; author he; state Exp; branches; next 1.4; commitid 4So50Z8Bs1OnEfxy; 1.4 date 2015.08.14.12.59.04; author he; state Exp; branches; next 1.3; commitid VxEjhIOxIMt5Lexy; 1.3 date 2015.08.11.13.19.21; author he; state Exp; branches; next 1.2; commitid JS88875NtEWyXQwy; 1.2 date 2015.04.14.09.06.12; author fhajny; state dead; branches; next 1.1; commitid nuQiMXuepZ1Loxhy; 1.1 date 2014.02.17.11.21.55; author fhajny; state Exp; branches; next ; commitid DWWhqXo7jtwLFrpx; desc @@ 1.12 log @Update sysutils/collectd and subpackages to 5.6.1. - Simplify patching somewhat by calling automake - Temporarily disable the processes plugin patch for NetBSD, until its code is amended for collectd code changes. Version 5.6.1 - Build system: Unnecessary linking of the Write Graphite plugin with libyajl has been removed. - collectd: A bug in the FlushInterval option that caused a segmentation fault in the Write HTTP plugin has been fixed. - Apache plugin: A syntax error has been fixed. - cURL-JSON plugin: A segmentation fault that occurred when handling JSON with unexpected structure has been fixed. - PostgreSQL plugin: Handling of NULL values in the query_plans and query_plans_by_table queries has been fixed. - RRDCacheD plugin: Reconnection behavior has been added. - VServer plugin: Use of a deprecated API (readdir_r()) has been fixed. - Write Graphite plugin: Make default values configurable at compile time again. - Write HTTP plugin: A bug has been fixed that lead to flush callbacks being registered twice. Version 5.6.0 - Build system: An option to to avoid building the DF plugin against XFS has been added. - Build system: Autoconf >=2.60, a C99-capable compiler and pkg-config are now required. - Build system: Building with -Werror is now optional. - Build system: Many compilation issues on non-Linux platforms have been fixed, leading to wider plugin support. - Build system: The configuration summary now also ends up in config.log. - collectd: All command-line options now override global options from the config file. - collectd: A number of unit tests for commonly used functions have been added. - collectd: Plugins start up and read timeouts are now logged. - collectd: Support for a timeout has been added to FLUSH callbacks. - collectd: The -T command line switch now reports more errors. - collectd: The max size of value list elements (DATA_MAX_NAME_LEN) has been doubled and is now configurable at build time. - Set target: The MetaData option has been added. - AMQP plugin, Write_HTTP plugin, Write_Kafka plugin: Support for libyajl < 2 has been added. - APC UPS plugin: Parsing of end markers has been fixed. - APC UPS plugin: The PersistentConnection option has been added. - ceph plugin, DNS plugin, Exec plugin, IPTables plugin, Ping plugin, turbostat plugin: When running unprivileged, these plugins will now warn about insuffiscient permissions or capabilities(7). - Chrony plugin: This new plugin collects NTP data from the chrony NTP server. - cpusleep plugin: This new plugin measures time spent by CPU in deep sleep mode. - CPU plugin: The ReportNumCpu option has been added. - cURL plugin, cURL-JSON plugin, cURL-XML plugin: The new Statistics reports various per-HTTP connection timers. - DBI plugin: The Interval option has been added to Database blocks. - Disk plugin: Support for FreeBSD has been added. - Empty Counter match: Support for derives has been implemented. - GenericJMX plugin: Support for TabularData and the PluginName option have been added. - GPS plugin: This new plugin reports the number of sattelites seen by and precision of a GPS receiver. - gRPC plugin: This new client and server plugin allows sending and receiving metrics using the gRPC protocol. Comparable to the UnixSock plugin, but using TCP and TLS. - Interface plugin: Reporting dropped packets has been added. - Interface plugin: The ReportInactive has been added, letting users skip inactive network interfaces. - Interface plugin: The new, Solaris-only UniqueName option has been added. - Lua plugin: This new language binding allows writing plugins using the Lua programming language. - Memory plugin: Reporting of ARC memory on Solaris has been added. - MQTT plugin: This new plugin sends metrics to and/or receives metrics from an MQTT broker. - MySQL plugin: Connection to the database server can now be done over SSL. - MySQL plugin: Monitoring slow queries has been added. - MySQL plugin: mysql_bpool_pages-flushed has been renamed to mysql_bpool_counters-pages_flushed because the value is cumulative. - MySQL plugin: Support for Galera statistics has been added. - MySQL plugin: Support for InnoDB metrics was improved. - MySQL plugin: The mysql_sort type has been split into 3 different types. - Network plugin: Decryption error logging has been improved. - Notify Nagios plugin: This new plugin sends notifications to Nagios as a passive check result. - NTPd plugin: The plugin now detects if the ntp daemon reports nanoseconds instead of microseconds. - OpenLDAP plugin: Several connection-related improvements have been made. - OpenLDAP plugin: Support for "simple authentication" has been added. - Ping plugin: The Size option has been added, allowing the ICMP data payload size to be configured. - PostgreSQL plugin, DBI plugin, Oracle plugin: The new PluginInstanceFrom option has been added. - PowerDNS plugin: The recursor metrics have been updated to 3.7.3 and missing rr types have been added. - Processes plugin: Counting of context switches was added for Linux. - Processes plugin: Improve reliability of thread counts on Linux. - Python plugin: Minimal Python version requirement has been bumped to 2.6. - Redis plugin: Several additional metrics are now collected. - Sensors plugin: The UseLabels option has been added. - SMART plugin: The new IgnoreSleepMode option has been added. - SMART plugin: The new UseSerial option allows identifying devices in a stable way. - SNMP plugin: The IpAddress can now be used for instances. - StatsD plugin: Latency calculation histogram is now able to shrink automatically to optimal size. - StatsD plugin: The CounterSum option has been added. - UUID plugin: The plugin now also looks in in smbios system table and /sys/class/dmi. - virt plugin: The PluginInstanceFormat option has been added. - Write Graphite plugin: The ReconnectInterval option has been added. - Write HTTP plugin: A KairosDB formatter has been added. - Write HTTP plugin: Notifications are now handled by this plugin. - Write HTTP plugin: The LogHttpError option has been added. - Write HTTP plugin: The new Headers option allows setting custom HTTP headers in outgoing requests. - Write Kafka plugin: Key handling has been made more comprehensive and reliable. - Write Redis plugin: The Database, MaxSetSize, Prefix and StoreRates options have been added. - Write Riemann plugin: The new BatchFlushTimeout and Timeout option have been added. - Write Riemann plugin: This plugin now requires the riemann-c-client library, version 1.6.0+. This adds support for submitting values to Riemann over TLS. - Write TSDB plugin, Write Sensu plugin, Write Riemann plugin, Write Graphite plugin, Write TSDB plugin: TCP keepalive is now enabled, helping graceful recovery from unclean network disconnections. - XenCPU plugin: This new plugin collects XEN Hypervisor CPU stats. - ZFS ARC plugin: Several new statistics have been added and a couple of obsolete ones removed. - Zone plugin: This new plugin reads per-zone CPU usage on Solaris. Version 5.5.2 - collectd: A division by zero has been fixed in the plugin_dispatch_multivalue() function. - collectd: The address of the Free Software Foundation has been fixed in GPL license headers. - Build system: Detection and handling of librrd 1.6 and later has been fixed. - Apache plugin: A warning about a possible misconfiguration has been added. - cURL, cURL-JSON and cURL-XML plugins: A memory leak when allocating more memory fails has been fixed. - DF plugin: A build issue on DragonFlyBSD has been fixed. - Ethstat plugin: Code to strip leading whitespace from device names. This works around an issue in the VMXNet3 driver. - Exec plugin: A problem in the error handling of an fdopen() failure has been fixed. - Modbus plugin: The debug output has been disabled by default. It is now only enabled when building with --enable-debug. - Network plugin: A check for the initialization of secure memory has been added. Previously, failure to initialize this memory was ignored. - Network plugin: A heap overflow has been fixed in the server code. This issue can be triggered remotely and is potentially exploitable. - Perl plugin: Init callbacks have been changed to run essentially single-threaded to avoid race conditions by init functions which create additional threads. - Processes plugin: A compilation error on systems without regex.h has been fixed. - Processes plugin: A memory leak on Solaris has been fixed. - Processes plugin: A warning about too long process names has been added. - Redis plugin: A memory leak in an error handling code path has been fixed. - Redis plugin: The data source type of the expired_keys metric has been corrected to DERIVE. - SMART plugin: A build dependency on libudev has been added. - StatsD plugin: A deadlock on plugin shutdown has been fixed. - Write HTTP plugin: Freeing of memory holding HTTP headers during shutdown has been fixed. - Write Sensu plugin: A segfault when the Tag was unset has been fixed. - ZFS ARC plugin: The cache_operation-stolen metric has been removed for FreeBSD 10.2 and later. @ text @$NetBSD: patch-configure,v 1.11 2016/02/03 13:10:27 he Exp $ Regen from configure.ac. --- configure.orig 2015-05-27 07:51:50.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_time 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 @ 1.11 log @When testing for kern.cp_time, really do that and not kern.cp_times (typo). Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.10 2015/09/17 11:24:11 he Exp $ @ 1.10 log @Regenerate autoconf-related files / diffs, so that the build should not complain about missing auto-tools. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.9 2015/09/12 19:04:56 he Exp $ d5 1 a5 1 --- configure.orig 2015-09-10 18:56:19.000000000 +0000 d128 1 a128 1 + /sbin/sysctl kern.cp_times 2>/dev/null @ 1.9 log @Add a plugin for NetBSD which submits the equivalent of the UDP and UDP6 parts of "netstat -s" output. Useful for monitoring e.g. packet discards due to full UDP socket buffers. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d16 1 a16 19 @@@@ -1083,9 +1085,6 @@@@ BUILD_WITH_LIBGCRYPT_TRUE GCRYPT_LIBS GCRYPT_LDFLAGS GCRYPT_CPPFLAGS -LIBGCRYPT_LIBS -LIBGCRYPT_CFLAGS -LIBGCRYPT_CONFIG BUILD_WITH_LIBGANGLIA_FALSE BUILD_WITH_LIBGANGLIA_TRUE GANGLIA_LIBS @@@@ -1327,7 +1326,6 @@@@ with_libdbi with_libesmtp with_libganglia with_libgcrypt -with_libgcrypt_prefix with_libiptc with_java with_libldap @@@@ -1431,6 +1429,7 @@@@ enable_multimeter d24 1 a24 1 @@@@ -2230,6 +2229,7 @@@@ collectd plugins: d32 1 a32 236 @@@@ -2334,8 +2334,6 @@@@ collectd additional packages: Path to libganglia. --with-libgcrypt[=PREFIX] Path to libgcrypt. - --with-libgcrypt-prefix=PFX - prefix where LIBGCRYPT is installed (optional) --with-libiptc[=PREFIX] Path to libiptc. --with-java[=PREFIX] Path to Java home. --with-libldap[=PREFIX] Path to libldap. @@@@ -3625,8 +3623,8 @@@@ esac -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@@@ -5196,8 +5194,7 @@@@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@@@ -5598,6 +5595,10 @@@@ freebsd* | dragonfly*) fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@@@ -5636,11 +5637,11 @@@@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@@@ -6760,7 +6761,7 @@@@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@@@ -6776,19 +6777,9 @@@@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@@@ -6807,10 +6798,7 @@@@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@@@ -8613,7 +8601,7 @@@@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@@@ -9091,9 +9079,6 @@@@ $as_echo_n "checking whether the $compil openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@@@ -9315,7 +9300,7 @@@@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@@@ -9492,7 +9477,6 @@@@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@@@ -9946,7 +9930,7 @@@@ $as_echo "$lt_cv_irix_exported_symbol" > link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@@@ -10783,6 +10767,17 @@@@ freebsd* | dragonfly*) esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@@@ -10899,7 +10894,7 @@@@ linux*oldld* | linux*aout* | linux*coff* ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@@@ -10963,18 +10958,6 @@@@ fi dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@@@ -12555,7 +12538,7 @@@@ else # at 6.2 and later dlopen does load deplibs. lt_cv_sys_dlopen_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) lt_cv_sys_dlopen_deplibs=yes ;; openbsd*) @@@@ -13026,7 +13009,7 @@@@ $as_echo "#define LIBTOOL_VERSION 2" >>c -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@@@ -13215,7 +13198,7 @@@@ else $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@@@ -13564,8 +13547,8 @@@@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@@@ -13835,6 +13818,7 @@@@ END as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@@@ -13908,7 +13892,7 @@@@ else d41 1 a41 1 @@@@ -13954,7 +13938,7 @@@@ else d50 1 a50 1 @@@@ -13978,7 +13962,7 @@@@ rm -f core conftest.err conftest.$ac_obj d59 1 a59 1 @@@@ -14023,7 +14007,7 @@@@ else d68 1 a68 1 @@@@ -14047,7 +14031,7 @@@@ rm -f core conftest.err conftest.$ac_obj d77 1 a77 1 @@@@ -15319,6 +15303,12 @@@@ $as_echo "#define KERNEL_OPENBSD 1" >>co d90 1 a90 1 @@@@ -15876,6 +15866,29 @@@@ fi d120 1 a120 1 @@@@ -16215,6 +16228,27 @@@@ else d148 1 a148 1 @@@@ -19171,6 +19205,54 @@@@ else d203 1 a203 222 @@@@ -20882,220 +20964,6 @@@@ fi if test "$with_libgcrypt" != "no"; then -# Check whether --with-libgcrypt-prefix was given. -if test "${with_libgcrypt_prefix+set}" = set; then : - withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval" -else - libgcrypt_config_prefix="" -fi - - if test x$libgcrypt_config_prefix != x ; then - if test x${LIBGCRYPT_CONFIG+set} != xset ; then - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config - fi - fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}libgcrypt-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}libgcrypt-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LIBGCRYPT_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $LIBGCRYPT_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG -if test -n "$LIBGCRYPT_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5 -$as_echo "$LIBGCRYPT_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_LIBGCRYPT_CONFIG"; then - ac_pt_LIBGCRYPT_CONFIG=$LIBGCRYPT_CONFIG - # Extract the first word of "libgcrypt-config", so it can be a program name with args. -set dummy libgcrypt-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_LIBGCRYPT_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_LIBGCRYPT_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$ac_pt_LIBGCRYPT_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_LIBGCRYPT_CONFIG=$ac_cv_path_ac_pt_LIBGCRYPT_CONFIG -if test -n "$ac_pt_LIBGCRYPT_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LIBGCRYPT_CONFIG" >&5 -$as_echo "$ac_pt_LIBGCRYPT_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_LIBGCRYPT_CONFIG" = x; then - LIBGCRYPT_CONFIG="no" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - LIBGCRYPT_CONFIG=$ac_pt_LIBGCRYPT_CONFIG - fi -else - LIBGCRYPT_CONFIG="$ac_cv_path_LIBGCRYPT_CONFIG" -fi - - tmp=1:1.2.0 - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` - min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` - else - req_libgcrypt_api=0 - min_libgcrypt_version="$tmp" - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5 -$as_echo_n "checking for LIBGCRYPT - version >= $min_libgcrypt_version... " >&6; } - ok=no - if test "$LIBGCRYPT_CONFIG" != "no" ; then - req_major=`echo $min_libgcrypt_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` - req_minor=`echo $min_libgcrypt_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` - req_micro=`echo $min_libgcrypt_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` - major=`echo $libgcrypt_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` - minor=`echo $libgcrypt_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` - micro=`echo $libgcrypt_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` - if test "$major" -gt "$req_major"; then - ok=yes - else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then - ok=yes - else - if test "$minor" -eq "$req_minor"; then - if test "$micro" -ge "$req_micro"; then - ok=yes - fi - fi - fi - fi - fi - fi - if test $ok = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libgcrypt_config_version)" >&5 -$as_echo "yes ($libgcrypt_config_version)" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - if test $ok = yes; then - # If we have a recent libgcrypt, we should also check that the - # API is compatible - if test "$req_libgcrypt_api" -gt 0 ; then - tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGCRYPT API version" >&5 -$as_echo_n "checking LIBGCRYPT API version... " >&6; } - if test "$req_libgcrypt_api" -eq "$tmp" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5 -$as_echo "okay" >&6; } - else - ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_libgcrypt_api got=$tmp" >&5 -$as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; } - fi - fi - fi - fi - if test $ok = yes; then - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` - : - if test x"$host" != x ; then - libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` - if test x"$libgcrypt_config_host" != xnone ; then - if test x"$libgcrypt_config_host" != x"$host" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -*** -*** The config script $LIBGCRYPT_CONFIG was -*** built for $libgcrypt_config_host and thus may not match the -*** used host $host. -*** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. -***" >&5 -$as_echo "$as_me: WARNING: -*** -*** The config script $LIBGCRYPT_CONFIG was -*** built for $libgcrypt_config_host and thus may not match the -*** used host $host. -*** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. -***" >&2;} - fi - fi - fi - else - LIBGCRYPT_CFLAGS="" - LIBGCRYPT_LIBS="" - with_libgcrypt="no (version 1.2.0+ required)" - fi - - - GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS $LIBGCRYPT_CFLAGS" GCRYPT_LIBS="$LIBGCRYPT_LIBS" fi @@@@ -27579,6 +27447,7 @@@@ plugin_load="no" d211 1 a211 1 @@@@ -27648,6 +27517,15 @@@@ then d227 1 a227 1 @@@@ -27890,6 +27768,11 @@@@ then d239 1 a239 1 @@@@ -31715,6 +31598,66 @@@@ fi d306 1 a306 1 @@@@ -36781,6 +36724,10 @@@@ if test -z "${BUILD_PLUGIN_NETLINK_TRUE} d317 1 a317 1 @@@@ -39602,6 +39549,7 @@@@ Configuration: @ 1.8 log @For consistency, rename HAVE_STRUCT_KINFO_PROC_NETBSD to HAVE_STRUCT_KINFO_PROC2_NETBSD since that's the variant we're actually using on NetBSD. Should result in the same code, so no revision bump. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.7 2015/08/26 12:19:27 he Exp $ d5 1 a5 1 --- configure.orig 2015-05-27 07:51:50.000000000 +0000 d7 53 a59 1 @@@@ -3625,8 +3625,8 @@@@ esac d70 1 a70 1 @@@@ -5196,8 +5196,7 @@@@ else d80 1 a80 1 @@@@ -5598,6 +5597,10 @@@@ freebsd* | dragonfly*) d91 1 a91 1 @@@@ -5636,11 +5639,11 @@@@ irix5* | irix6* | nonstopux*) d105 1 a105 1 @@@@ -6760,7 +6763,7 @@@@ ia64-*-hpux*) d114 1 a114 1 @@@@ -6776,19 +6779,9 @@@@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* d136 1 a136 1 @@@@ -6807,10 +6800,7 @@@@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* d148 1 a148 1 @@@@ -8613,7 +8603,7 @@@@ lt_prog_compiler_static= d157 1 a157 1 @@@@ -9091,9 +9081,6 @@@@ $as_echo_n "checking whether the $compil d167 1 a167 1 @@@@ -9315,7 +9302,7 @@@@ _LT_EOF d176 1 a176 1 @@@@ -9492,7 +9479,6 @@@@ _LT_EOF d184 1 a184 1 @@@@ -9946,7 +9932,7 @@@@ $as_echo "$lt_cv_irix_exported_symbol" > d193 1 a193 1 @@@@ -10783,6 +10769,17 @@@@ freebsd* | dragonfly*) d211 1 a211 1 @@@@ -10899,7 +10896,7 @@@@ linux*oldld* | linux*aout* | linux*coff* d220 1 a220 1 @@@@ -10963,18 +10960,6 @@@@ fi d239 1 a239 1 @@@@ -12555,7 +12540,7 @@@@ else d248 1 a248 1 @@@@ -13026,7 +13011,7 @@@@ $as_echo "#define LIBTOOL_VERSION 2" >>c d257 1 a257 1 @@@@ -13215,7 +13200,7 @@@@ else d266 1 a266 1 @@@@ -13564,8 +13549,8 @@@@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma d277 1 a277 1 @@@@ -13835,6 +13820,7 @@@@ END d285 1 a285 1 @@@@ -13908,7 +13894,7 @@@@ else d294 1 a294 1 @@@@ -13954,7 +13940,7 @@@@ else d303 1 a303 1 @@@@ -13978,7 +13964,7 @@@@ rm -f core conftest.err conftest.$ac_obj d312 1 a312 1 @@@@ -14023,7 +14009,7 @@@@ else d321 1 a321 1 @@@@ -14047,7 +14033,7 @@@@ rm -f core conftest.err conftest.$ac_obj d330 1 a330 1 @@@@ -15319,6 +15305,12 @@@@ $as_echo "#define KERNEL_OPENBSD 1" >>co d343 1 a343 1 @@@@ -15876,6 +15868,29 @@@@ fi d373 1 a373 1 @@@@ -16215,6 +16230,27 @@@@ else d401 1 a401 1 @@@@ -19171,6 +19207,54 @@@@ else d456 1 a456 1 @@@@ -20882,6 +20966,7 @@@@ fi d460 183 a642 8 + # Check whether --with-libgcrypt-prefix was given. if test "${with_libgcrypt_prefix+set}" = set; then : withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval" @@@@ -21065,10 +21150,9 @@@@ $as_echo "does not match. want=$req_libg LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` : d647 16 a662 10 + libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` + if test x"$libgcrypt_config_host" != xnone ; then + if test x"$libgcrypt_config_host" != x"$host" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** *** The config script $LIBGCRYPT_CONFIG was @@@@ -21085,7 +21169,6 @@@@ $as_echo "$as_me: WARNING: *** You may want to use the configure option --with-libgcrypt-prefix *** to specify a matching config script. ***" >&2;} d664 22 a685 4 fi fi else @@@@ -27648,6 +27731,14 @@@@ then d695 1 d701 1 a701 1 @@@@ -27890,6 +27981,11 @@@@ then d713 86 @ 1.7 log @Improve the cpu plugin for NetBSD, should get rid of warnings logged on hosts with hw.ncpu > 1. PKGREVISION bumped. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.6 2015/08/18 07:47:46 he Exp $ d7 1 a7 57 @@@@ -975,12 +975,6 @@@@ BUILD_WITH_LIBSIGROK_FALSE BUILD_WITH_LIBSIGROK_TRUE BUILD_WITH_LIBSIGROK_LDFLAGS BUILD_WITH_LIBSIGROK_CFLAGS -GLIB_COMPILE_RESOURCES -GLIB_MKENUMS -GOBJECT_QUERY -GLIB_GENMARSHAL -GLIB_LIBS -GLIB_CFLAGS BUILD_WITH_LM_SENSORS_FALSE BUILD_WITH_LM_SENSORS_TRUE BUILD_WITH_LIBSENSORS_LDFLAGS @@@@ -1083,9 +1077,6 @@@@ BUILD_WITH_LIBGCRYPT_TRUE GCRYPT_LIBS GCRYPT_LDFLAGS GCRYPT_CPPFLAGS -LIBGCRYPT_LIBS -LIBGCRYPT_CFLAGS -LIBGCRYPT_CONFIG BUILD_WITH_LIBGANGLIA_FALSE BUILD_WITH_LIBGANGLIA_TRUE GANGLIA_LIBS @@@@ -1327,7 +1318,6 @@@@ with_libdbi with_libesmtp with_libganglia with_libgcrypt -with_libgcrypt_prefix with_libiptc with_java with_libldap @@@@ -1354,7 +1344,6 @@@@ with_librouteros with_librrd with_libsensors with_libsigrok -enable_glibtest with_libstatgrab with_libtokyotyrant with_libudev @@@@ -2156,7 +2145,6 @@@@ Optional Features: --disable-silent-rules verbose build output (undo: "make V=0") --disable-largefile omit support for large files --enable-standards Enable standards compliance mode - --disable-glibtest do not try to compile and run a test GLIB program collectd features: --enable-debug enable debugging (disabled by def) @@@@ -2334,8 +2322,6 @@@@ collectd additional packages: Path to libganglia. --with-libgcrypt[=PREFIX] Path to libgcrypt. - --with-libgcrypt-prefix=PFX - prefix where LIBGCRYPT is installed (optional) --with-libiptc[=PREFIX] Path to libiptc. --with-java[=PREFIX] Path to Java home. --with-libldap[=PREFIX] Path to libldap. @@@@ -3625,8 +3611,8 @@@@ esac d18 1 a18 1 @@@@ -5196,8 +5182,7 @@@@ else d28 1 a28 1 @@@@ -5598,6 +5583,10 @@@@ freebsd* | dragonfly*) d39 1 a39 1 @@@@ -5636,11 +5625,11 @@@@ irix5* | irix6* | nonstopux*) d53 1 a53 1 @@@@ -6760,7 +6749,7 @@@@ ia64-*-hpux*) d62 1 a62 1 @@@@ -6776,19 +6765,9 @@@@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* d74 2 a75 1 - ;; d78 1 a78 2 + LD="${LD-ld} -m elf_i386" ;; d84 1 a84 1 @@@@ -6807,10 +6786,7 @@@@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* d96 1 a96 1 @@@@ -8613,7 +8589,7 @@@@ lt_prog_compiler_static= d105 1 a105 1 @@@@ -9091,9 +9067,6 @@@@ $as_echo_n "checking whether the $compil d115 1 a115 1 @@@@ -9315,7 +9288,7 @@@@ _LT_EOF d124 1 a124 1 @@@@ -9492,7 +9465,6 @@@@ _LT_EOF d132 1 a132 1 @@@@ -9946,7 +9918,7 @@@@ $as_echo "$lt_cv_irix_exported_symbol" > d141 1 a141 1 @@@@ -10783,6 +10755,17 @@@@ freebsd* | dragonfly*) d159 1 a159 1 @@@@ -10899,7 +10882,7 @@@@ linux*oldld* | linux*aout* | linux*coff* d168 1 a168 1 @@@@ -10963,18 +10946,6 @@@@ fi d187 1 a187 1 @@@@ -12555,7 +12526,7 @@@@ else d196 1 a196 1 @@@@ -13026,7 +12997,7 @@@@ $as_echo "#define LIBTOOL_VERSION 2" >>c d205 1 a205 1 @@@@ -13215,7 +13186,7 @@@@ else d214 1 a214 1 @@@@ -13564,8 +13535,8 @@@@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma d225 1 a225 1 @@@@ -13835,6 +13806,7 @@@@ END d233 1 a233 1 @@@@ -13908,7 +13880,7 @@@@ else d242 1 a242 1 @@@@ -13954,7 +13926,7 @@@@ else d251 1 a251 1 @@@@ -13978,7 +13950,7 @@@@ rm -f core conftest.err conftest.$ac_obj d260 1 a260 1 @@@@ -14023,7 +13995,7 @@@@ else d269 1 a269 1 @@@@ -14047,7 +14019,7 @@@@ rm -f core conftest.err conftest.$ac_obj d278 1 a278 1 @@@@ -15319,6 +15291,12 @@@@ $as_echo "#define KERNEL_OPENBSD 1" >>co d291 1 a291 1 @@@@ -15876,6 +15854,29 @@@@ fi d321 1 a321 1 @@@@ -16215,6 +16216,27 @@@@ else d349 1 a349 1 @@@@ -19171,6 +19193,54 @@@@ else d367 1 a367 1 +$as_echo "#define HAVE_STRUCT_KINFO_PROC_NETBSD 1" >>confdefs.h d369 1 a369 1 + have_struct_kinfo_proc_netbsd="yes" d373 1 a373 1 + have_struct_kinfo_proc_netbsd="no" d390 1 a390 1 +$as_echo "#define HAVE_STRUCT_KINFO_PROC_NETBSD 1" >>confdefs.h d392 1 a392 1 + have_struct_kinfo_proc_netbsd="yes" d396 1 a396 1 + have_struct_kinfo_proc_netbsd="no" d404 1 a404 1 @@@@ -20882,220 +20952,6 @@@@ fi d408 8 a415 183 -# Check whether --with-libgcrypt-prefix was given. -if test "${with_libgcrypt_prefix+set}" = set; then : - withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval" -else - libgcrypt_config_prefix="" -fi - - if test x$libgcrypt_config_prefix != x ; then - if test x${LIBGCRYPT_CONFIG+set} != xset ; then - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config - fi - fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}libgcrypt-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}libgcrypt-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LIBGCRYPT_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $LIBGCRYPT_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG -if test -n "$LIBGCRYPT_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5 -$as_echo "$LIBGCRYPT_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_LIBGCRYPT_CONFIG"; then - ac_pt_LIBGCRYPT_CONFIG=$LIBGCRYPT_CONFIG - # Extract the first word of "libgcrypt-config", so it can be a program name with args. -set dummy libgcrypt-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_LIBGCRYPT_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_LIBGCRYPT_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$ac_pt_LIBGCRYPT_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_LIBGCRYPT_CONFIG=$ac_cv_path_ac_pt_LIBGCRYPT_CONFIG -if test -n "$ac_pt_LIBGCRYPT_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LIBGCRYPT_CONFIG" >&5 -$as_echo "$ac_pt_LIBGCRYPT_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_LIBGCRYPT_CONFIG" = x; then - LIBGCRYPT_CONFIG="no" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - LIBGCRYPT_CONFIG=$ac_pt_LIBGCRYPT_CONFIG - fi -else - LIBGCRYPT_CONFIG="$ac_cv_path_LIBGCRYPT_CONFIG" -fi - - tmp=1:1.2.0 - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` - min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` - else - req_libgcrypt_api=0 - min_libgcrypt_version="$tmp" - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5 -$as_echo_n "checking for LIBGCRYPT - version >= $min_libgcrypt_version... " >&6; } - ok=no - if test "$LIBGCRYPT_CONFIG" != "no" ; then - req_major=`echo $min_libgcrypt_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` - req_minor=`echo $min_libgcrypt_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` - req_micro=`echo $min_libgcrypt_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` - major=`echo $libgcrypt_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` - minor=`echo $libgcrypt_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` - micro=`echo $libgcrypt_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` - if test "$major" -gt "$req_major"; then - ok=yes - else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then - ok=yes - else - if test "$minor" -eq "$req_minor"; then - if test "$micro" -ge "$req_micro"; then - ok=yes - fi - fi - fi - fi - fi - fi - if test $ok = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libgcrypt_config_version)" >&5 -$as_echo "yes ($libgcrypt_config_version)" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - if test $ok = yes; then - # If we have a recent libgcrypt, we should also check that the - # API is compatible - if test "$req_libgcrypt_api" -gt 0 ; then - tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGCRYPT API version" >&5 -$as_echo_n "checking LIBGCRYPT API version... " >&6; } - if test "$req_libgcrypt_api" -eq "$tmp" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5 -$as_echo "okay" >&6; } - else - ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_libgcrypt_api got=$tmp" >&5 -$as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; } - fi - fi - fi - fi - if test $ok = yes; then - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` - : d420 10 a429 16 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -*** -*** The config script $LIBGCRYPT_CONFIG was -*** built for $libgcrypt_config_host and thus may not match the -*** used host $host. -*** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. -***" >&5 -$as_echo "$as_me: WARNING: -*** -*** The config script $LIBGCRYPT_CONFIG was -*** built for $libgcrypt_config_host and thus may not match the -*** used host $host. -*** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. -***" >&2;} d431 4 a434 374 - fi - fi - else - LIBGCRYPT_CFLAGS="" - LIBGCRYPT_LIBS="" - with_libgcrypt="no (version 1.2.0+ required)" - fi - - - GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS $LIBGCRYPT_CFLAGS" GCRYPT_LIBS="$LIBGCRYPT_LIBS" fi @@@@ -25235,358 +25091,7 @@@@ fi if test "x$with_libsigrok" = "xyes" then - # Check whether --enable-glibtest was given. -if test "${enable_glibtest+set}" = set; then : - enableval=$enable_glibtest; -else - enable_glibtest=yes -fi - - - pkg_config_args=glib-2.0 - for module in . - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done - - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.16 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - - no_glib="" - - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi - - min_glib_version=2.28.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5 -$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi - - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi - - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` - - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" - rm -f conf.glibtest - if test "$cross_compiling" = yes; then : - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#include - -int -main () -{ - unsigned int major, minor, micro; - - fclose (fopen ("conf.glibtest", "w")); - - if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - no_glib=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 -$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } - with_libsigrok_cflags="$with_libsigrok_cflags $GLIB_CFLAGS"; with_libsigrok_ldflags="$with_libsigrok_ldflags $GLIB_LIBS" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed." -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - GLIB_COMPILE_RESOURCES="" - : - fi - - - - - - - rm -f conf.glibtest + with_libsigrok="no (glib not available)" fi @@@@ -27648,6 +27153,14 @@@@ then d449 1 a449 1 @@@@ -27890,6 +27403,11 @@@@ then @ 1.6 log @Another round of update to collectd: * Add support for the "irq" plugin on NetBSD. * Declare BUILD_DEFS+= VARBASE to silence pkglint. * Tweak Makefile.am instead; commit regenerated Makefile.in with automake. * Adjust the patch for the df plugin so it builds both in newer (> 6.99.19) and older NetBSD (e.g. 6.1.5) * Adjust the entropy plugin to use and _PATH_URANDOM to silence pkglint. PKGREVISION bumped to 5. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.5 2015/08/14 15:39:28 he Exp $ d7 283 a289 1 @@@@ -13908,7 +13908,7 @@@@ else d298 1 a298 1 @@@@ -13954,7 +13954,7 @@@@ else d307 1 a307 1 @@@@ -13978,7 +13978,7 @@@@ rm -f core conftest.err conftest.$ac_obj d316 1 a316 1 @@@@ -14023,7 +14023,7 @@@@ else d325 1 a325 1 @@@@ -14047,7 +14047,7 @@@@ rm -f core conftest.err conftest.$ac_obj d334 1 a334 1 @@@@ -15319,6 +15319,12 @@@@ $as_echo "#define KERNEL_OPENBSD 1" >>co d347 1 a347 1 @@@@ -15876,6 +15882,29 @@@@ fi d377 29 a405 1 @@@@ -19171,6 +19200,54 @@@@ else d460 582 a1041 1 @@@@ -27648,6 +27725,14 @@@@ then d1056 1 a1056 1 @@@@ -27890,6 +27975,11 @@@@ then @ 1.5 log @Add a port of the processes plugin to NetBSD. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.4 2015/08/14 12:59:04 he Exp $ d150 1 a150 1 @@@@ -27648,6 +27725,13 @@@@ then d157 1 d165 1 a165 1 @@@@ -27890,6 +27974,11 @@@@ then @ 1.4 log @Include sys/rndio.h if it's available to be able to compile the entropy plugin on newer NetBSD releases (>= 7.99.9, by the looks of it). No PKGREVISION bump since this is a configure+build fix. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.3 2015/08/11 13:19:21 he Exp $ d150 1 a150 1 @@@@ -27648,6 +27725,12 @@@@ then d157 1 d164 1 a164 1 @@@@ -27890,6 +27973,11 @@@@ then @ 1.3 log @Port some of the plugins to support NetBSD: * entropy * memory * swap * disk by shamelessly copying code from vmstat/iostat/rndctl etc. Add comments to one patch missing one. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d65 31 a95 1 @@@@ -19171,6 +19177,54 @@@@ else d150 1 a150 1 @@@@ -27648,6 +27702,12 @@@@ then d163 1 a163 1 @@@@ -27890,6 +27950,11 @@@@ then @ 1.2 log @Remove stale patch file. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.1 2014/02/17 11:21:55 fhajny Exp $ d3 3 a5 2 Remove m4 cruft. --- configure.orig 2014-01-26 08:10:00.249270750 +0000 d7 81 a87 17 @@@@ -18338,19 +18338,19 @@@@ $as_echo_n "checking if have htonll defi have_htonll="no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -[ + #include #include #if HAVE_INTTYPES_H # include #endif -] + int main () { -[ d89 1 a89 2 return htonll(0); -] d91 32 d124 21 a144 2 ; return 0; @ 1.1 log @Import collectd-5.4.1 as sysutils/collectd (+ plugins), based on wip/collectd5. collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways, for example in RRD-files. @ text @d1 1 a1 1 $NetBSD$ @