X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=d1adcab7c262ea420e265074f65ff7bbf391f930;hb=c9a5b0349213c09f01108993eb0072627e6a890c;hp=e5cf5cb55a550b4a95ec040483478bd0b5d2beb0;hpb=c1e47ad7b5e5e889fb86250f714b299e4bf8819f;p=collectd.git diff --git a/configure.in b/configure.in index e5cf5cb5..d1adcab7 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(collectd, 3.5.0) +AC_INIT(collectd, 3.8.1-alpha2) AC_CONFIG_SRCDIR(src/collectd.c) AC_CONFIG_HEADERS(src/config.h) AM_INIT_AUTOMAKE(dist-bzip2) @@ -15,6 +15,7 @@ AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET +AM_CONDITIONAL(COMPILER_IS_GCC, test "x$GCC" = "xyes") dnl configure libtool AC_DISABLE_STATIC @@ -31,15 +32,75 @@ AC_CONFIG_SUBDIRS(libltdl src/libconfig) # AC_HEADER_SYS_WAIT AC_HEADER_DIRENT +AC_CHECK_HEADERS(errno.h) +AC_CHECK_HEADERS(syslog.h) AC_CHECK_HEADERS(fcntl.h) AC_CHECK_HEADERS(signal.h) +AC_CHECK_HEADERS(assert.h) +AC_CHECK_HEADERS(sys/types.h) AC_CHECK_HEADERS(sys/socket.h) AC_CHECK_HEADERS(sys/select.h) AC_CHECK_HEADERS(netdb.h) +AC_CHECK_HEADERS(arpa/inet.h) AC_CHECK_HEADERS(sys/resource.h) AC_CHECK_HEADERS(sys/param.h) -AC_CHECK_HEADERS(errno.h) -AC_CHECK_HEADERS(syslog.h) + +# For ping library +AC_CHECK_HEADERS(netinet/in_systm.h) +AC_CHECK_HEADERS(netinet/in.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/ip.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/ip_icmp.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +#if HAVE_NETINET_IP_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/ip_var.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +#if HAVE_NETINET_IP_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/ip6.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/icmp6.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +#if HAVE_NETINET_IP6_H +# include +#endif +]) # For cpu modules AC_CHECK_HEADERS(sys/sysctl.h sys/dkstat.h) @@ -47,10 +108,6 @@ AC_CHECK_HEADERS(sys/sysctl.h sys/dkstat.h) # For load module AC_CHECK_HEADERS(sys/loadavg.h) -# For ping module -AC_CHECK_HEADERS(arpa/inet.h) -AC_CHECK_HEADERS(netinet/in.h) - # For users module AC_CHECK_HEADERS(utmp.h) AC_CHECK_HEADERS(utmpx.h) @@ -74,6 +131,7 @@ AC_CHECK_HEADERS(sys/mntent.h) AC_CHECK_HEADERS(sys/mnttab.h) AC_CHECK_HEADERS(sys/mount.h) AC_CHECK_HEADERS(sys/statfs.h) +AC_CHECK_HEADERS(sys/statvfs.h) AC_CHECK_HEADERS(sys/vfs.h) AC_CHECK_HEADERS(sys/vfstab.h) @@ -98,7 +156,7 @@ AC_HEADER_TIME AC_PROG_GCC_TRADITIONAL AC_CHECK_FUNCS(gettimeofday select strdup strtol) AC_CHECK_FUNCS(socket, , AC_CHECK_LIB(socket, socket)) -AC_CHECK_FUNCS(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname)) +AC_CHECK_FUNCS(getaddrinfo getnameinfo) AC_CHECK_FUNCS(strchr memcpy strstr strcmp strncmp strncpy strlen) AC_CHECK_FUNCS(strncasecmp strcasecmp) AC_CHECK_FUNCS(openlog syslog closelog) @@ -106,6 +164,9 @@ AC_CHECK_FUNCS(openlog syslog closelog) # For cpu module AC_CHECK_FUNCS(sysctlbyname, [have_sysctlbyname="yes"], [have_sysctlbyname="no"]) +# For df module +AC_CHECK_FUNCS(statfs statvfs) + # For load module AC_CHECK_FUNCS(getloadavg, [have_getloadavg="yes"], [have_getloadavg="no"]) @@ -118,7 +179,26 @@ AC_CHECK_FUNCS(getgrgid getpwuid) # For mount interface AC_CHECK_FUNCS(getfsent getvfsent listmntent) +AC_CHECK_FUNCS(getfsstat) + +# Check for different versions of `getmntent' here.. AC_FUNC_GETMNTENT +if test "x$ac_cv_lib_sun_getmntent" = "xyes" +then + AC_DEFINE(HAVE_SUN_GETMNTENT, 1, + [Define if the function getmntent exists. It's the version from libsun.]) +fi +if test "x$ac_cv_lib_seq_getmntent" = "xyes" +then + AC_DEFINE(HAVE_SEQ_GETMNTENT, 1, + [Define if the function getmntent exists. It's the version from libseq.]) +fi +if test "x$ac_cv_lib_gen_getmntent" = "xyes" +then + AC_DEFINE(HAVE_GEN_GETMNTENT, 1, + [Define if the function getmntent exists. It's the version from libgen.]) +fi + if test "x$ac_cv_func_getmntent" = "xyes"; then saveCFLAGS="$CFLAGS" CFLAGS="-Wall -Werror $CFLAGS" @@ -182,9 +262,21 @@ case $host_os in esac AC_MSG_RESULT([$ac_system]) -dnl Checks for libraries. -AC_CHECK_LIB(socket, socket) -AC_CHECK_LIB(resolv, res_search) +with_libsocket="yes" +AC_CHECK_LIB(socket, socket, +[ + AC_DEFINE(HAVE_LIBSOCKET, 1, [Define to 1 if you have the 'socket' library (-lsocket).]) +], +[with_libsocket="no"]) +AM_CONDITIONAL(BUILD_WITH_LIBSOCKET, test "x$with_libsocket" = "xyes") + +with_libresolv="yes" +AC_CHECK_LIB(resolv, res_search, +[ + AC_DEFINE(HAVE_LIBRESOLV, 1, [Define to 1 if you have the 'resolv' library (-lresolv).]) +], +[with_libresolv="no"]) +AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes") m4_divert_once([HELP_WITH], [ collectd additional packages:]) @@ -200,7 +292,11 @@ AC_ARG_WITH(rrdtool, [AS_HELP_STRING([--with-rrdtool@<:@=PREFIX@:>@], [Path to r ], [with_rrdtool="yes"]) if test "x$with_rrdtool" = "xyes" then - AC_CHECK_LIB(rrd, rrd_update,, [with_rrdtool="no (librrd not found)"], [-lm]) + AC_CHECK_LIB(rrd, rrd_update, + [ + AC_DEFINE(HAVE_LIBRRD, 1, [Define to 1 if you have the rrd library (-lrrd).]) + ], + [with_rrdtool="no (librrd not found)"], [-lm]) fi if test "x$with_rrdtool" = "xyes" then @@ -347,7 +443,41 @@ AC_DEFINE_UNQUOTED(COLLECT_LM_SENSORS, [$collect_lm_sensors], [Wether or not to use sensors library]) AM_CONDITIONAL(BUILD_WITH_LM_SENSORS, test "x$with_lm_sensors" = "xyes") - +AC_ARG_WITH(libmysql, [AS_HELP_STRING([--with-libmysql@<:@=PREFIX@:>@], [Path to libmysql.])], +[ + if test "x$withval" != "xno" && test "x$withval" != "xyes" + then + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" + with_libmysql="yes" + fi +], +[ + with_libmysql="yes" +]) +if test "x$with_libmysql" = "xyes" +then + AC_CHECK_LIB(mysqlclient, mysql_init, + [ + AC_DEFINE(HAVE_LIBMYSQLCLIENT, 1, [Define to 1 if you have the mysqlclient library (-lmysqlclient).]) + ], [with_libmysql="no (libmysql not found)"]) +fi +if test "x$with_libmysql" = "xyes" +then + AC_CHECK_HEADERS(mysql/mysql.h, + [ + AC_DEFINE(HAVE_MYSQL_MYSQL_H, 1, [Define to 1 if you have the header file.]) + ], [with_libmysql="no (mysql/mysql.h not found)"]) +fi +if test "x$with_libmysql" = "xyes" +then + collect_libmysql=1 +else + collect_libmysql=0 +fi +AC_DEFINE_UNQUOTED(COLLECT_LIBMYSQL, [$collect_libmysql], + [Wether or not to use mysql library]) +AM_CONDITIONAL(BUILD_WITH_LIBMYSQL, test "x$with_libmysql" = "xyes") # # Check for enabled/disabled features @@ -413,252 +543,251 @@ fi ]dnl )# AC_COLLECTD(name, enable/disable, info-text, feature/module) - - -#m4_divert_once([HELP_ENABLE], [ -#collectd modules:]) -#AC_COLLECTD([cpu], [disable], [module], [cpu usage statistics]) -#AC_COLLECTD([cpufreq], [disable], [module], [system cpu frequency statistics]) -#AC_COLLECTD([disk], [disable], [module], [disk/partition statistics]) -#AC_COLLECTD([quota], [enable], [module], [quota statistics (experimental)]) -#AC_COLLECTD([hddtemp], [disable], [module], [hdd temperature statistics]) -#AC_COLLECTD([load], [disable], [module], [system load statistics]) -#AC_COLLECTD([memory], [disable], [module], [memory statistics]) -#AC_COLLECTD([nfs], [disable], [module], [nfs statistics]) -#AC_COLLECTD([ping], [disable], [module], [ping statistics]) -#AC_COLLECTD([processes], [disable], [module], [processes statistics]) -#AC_COLLECTD([sensors], [disable], [module], [lm_sensors statistics]) -#AC_COLLECTD([serial], [disable], [module], [serial statistics]) -#AC_COLLECTD([swap], [disable], [module], [swap statistics]) -#AC_COLLECTD([tape], [disable], [module], [tape statistics]) -#AC_COLLECTD([traffic], [disable], [module], [system traffic statistics]) -#AC_COLLECTD([users], [disable], [module], [user count statistics]) - - - m4_divert_once([HELP_ENABLE], [ collectd features:]) - AC_COLLECTD([debug], [enable], [feature], [debugging]) AC_COLLECTD([daemon], [disable], [feature], [daemon mode]) m4_divert_once([HELP_ENABLE], [ collectd modules:]) -AC_ARG_ENABLE(cpu, AC_HELP_STRING([--disable-cpu], [Disable CPU usage statistics]),, [enable_cpu="yes"]) -if test "x$enable_cpu" != "xno" -then - if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$have_sysctlbyname" = "xyes" - then - enable_cpu="yes" - else - enable_cpu="no" - fi -fi -if test "x$enable_cpu" = "xno" -then - AC_DEFINE(COLLECT_CPU, 0, [Wether or not to collect CPU usage statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_CPU, test "x$enable_cpu" = "xyes") +AC_COLLECTD([battery], [disable], [module], [battery statistics]) +AC_COLLECTD([cpu], [disable], [module], [cpu usage statistics]) +AC_COLLECTD([cpufreq], [disable], [module], [system cpu frequency statistics]) +AC_COLLECTD([disk], [disable], [module], [disk/partition statistics]) +AC_COLLECTD([df], [disable], [module], [df statistics]) +AC_COLLECTD([quota], [enable], [module], [quota statistics (experimental)]) +AC_COLLECTD([hddtemp], [disable], [module], [hdd temperature statistics]) +AC_COLLECTD([load], [disable], [module], [system load statistics]) +AC_COLLECTD([memory], [disable], [module], [memory statistics]) +AC_COLLECTD([mysql], [disable], [module], [mysql statistics]) +AC_COLLECTD([nfs], [disable], [module], [nfs statistics]) +AC_COLLECTD([ping], [disable], [module], [ping statistics]) +AC_COLLECTD([processes], [disable], [module], [processes statistics]) +AC_COLLECTD([sensors], [disable], [module], [lm_sensors statistics]) +AC_COLLECTD([serial], [disable], [module], [serial statistics]) +AC_COLLECTD([swap], [disable], [module], [swap statistics]) +AC_COLLECTD([tape], [disable], [module], [tape statistics]) +AC_COLLECTD([traffic], [disable], [module], [system traffic statistics]) +AC_COLLECTD([users], [disable], [module], [user count statistics]) +AC_COLLECTD([wireless], [disable], [module], [wireless link statistics]) -AC_ARG_ENABLE(cpufreq, AC_HELP_STRING([--disable-cpufreq], [Disable system cpu frequency statistics]),, [enable_cpufreq="yes"]) -if test "x$enable_cpufreq" != "xno" -then - if test "x$ac_system" = "xLinux" - then - enable_cpufreq="yes" - else - enable_cpufreq="no" - fi -fi -if test "x$enable_cpufreq" = "xno" -then - AC_DEFINE(COLLECT_CPUFREQ, 0, [Wether or not to collect cpu frequency statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_CPUFREQ, test "x$enable_cpufreq" = "xyes") +#m4_divert_once([HELP_ENABLE], [ +#collectd modules:]) +#AC_ARG_ENABLE(cpu, AC_HELP_STRING([--disable-cpu], [Disable CPU usage statistics]),, [enable_cpu="yes"]) +#if test "x$enable_cpu" != "xno" +#then +# if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$have_sysctlbyname" = "xyes" +# then +# enable_cpu="yes" +# else +# enable_cpu="no" +# fi +#fi +#if test "x$enable_cpu" = "xno" +#then +# AC_DEFINE(COLLECT_CPU, 0, [Wether or not to collect CPU usage statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_CPU, test "x$enable_cpu" = "xyes") -AC_ARG_ENABLE(disk, AC_HELP_STRING([--disable-disk], [Disable disk/partition statistics]),, [enable_disk="yes"]) -if test "x$enable_disk" != "xno" -then - if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" - then - enable_disk="yes" - else - enable_disk="no" - fi -fi -if test "x$enable_disk" = "xno" -then - AC_DEFINE(COLLECT_DISK, 0, [Wether or not to collect diskstats]) -fi -AM_CONDITIONAL(BUILD_MODULE_DISK, test "x$enable_disk" = "xyes") +#AC_ARG_ENABLE(cpufreq, AC_HELP_STRING([--disable-cpufreq], [Disable system cpu frequency statistics]),, [enable_cpufreq="yes"]) +#if test "x$enable_cpufreq" != "xno" +#then +# if test "x$ac_system" = "xLinux" +# then +# enable_cpufreq="yes" +# else +# enable_cpufreq="no" +# fi +#fi +#if test "x$enable_cpufreq" = "xno" +#then +# AC_DEFINE(COLLECT_CPUFREQ, 0, [Wether or not to collect cpu frequency statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_CPUFREQ, test "x$enable_cpufreq" = "xyes") -AC_ARG_ENABLE(hddtemp, AC_HELP_STRING([--disable-hddtemp], [Disable hdd temperature statistics]),, [enable_hddtemp="yes"]) -if test "x$enable_hddtemp" = "xno" -then - AC_DEFINE(COLLECT_HDDTEMP, 0, [Wether or not to collect hdd temperature statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_HDDTEMP, test "x$enable_hddtemp" = "xyes") +#AC_ARG_ENABLE(disk, AC_HELP_STRING([--disable-disk], [Disable disk/partition statistics]),, [enable_disk="yes"]) +#if test "x$enable_disk" != "xno" +#then +# if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" +# then +# enable_disk="yes" +# else +# enable_disk="no" +# fi +#fi +#if test "x$enable_disk" = "xno" +#then +# AC_DEFINE(COLLECT_DISK, 0, [Wether or not to collect diskstats]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_DISK, test "x$enable_disk" = "xyes") -AC_ARG_ENABLE(load, AC_HELP_STRING([--disable-load], [Disable system load statistics]),, [enable_load="yes"]) -if test "x$enable_load" != "xno" -then - if test "x$have_getloadavg" = "xyes" -o "x$ac_system" = "xLinux" -o "x$with_libstatgrab" = "xyes" - then - enable_load="yes" - else - enable_load="no" - fi -fi -if test "x$enable_load" = "xno" -then - AC_DEFINE(COLLECT_LOAD, 0, [Wether or not to collect system load statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_LOAD, test "x$enable_load" = "xyes") +#AC_ARG_ENABLE(hddtemp, AC_HELP_STRING([--disable-hddtemp], [Disable hdd temperature statistics]),, [enable_hddtemp="yes"]) +#if test "x$enable_hddtemp" = "xno" +#then +# AC_DEFINE(COLLECT_HDDTEMP, 0, [Wether or not to collect hdd temperature statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_HDDTEMP, test "x$enable_hddtemp" = "xyes") -AC_ARG_ENABLE(memory, AC_HELP_STRING([--disable-memory], [Disable memory statistics]),, [enable_memory="yes"]) -if test "x$enable_memory" != "xno" -then - if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$with_libstatgrab" = "xyes" - then - enable_memory="yes" - else - enable_memory="no" - fi -fi -if test "x$enable_memory" = "xno" -then - AC_DEFINE(COLLECT_MEMORY, 0, [Wether or not to collect memory statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_MEMORY, test "x$enable_memory" = "xyes") +#AC_ARG_ENABLE(load, AC_HELP_STRING([--disable-load], [Disable system load statistics]),, [enable_load="yes"]) +#if test "x$enable_load" != "xno" +#then +# if test "x$have_getloadavg" = "xyes" -o "x$ac_system" = "xLinux" -o "x$with_libstatgrab" = "xyes" +# then +# enable_load="yes" +# else +# enable_load="no" +# fi +#fi +#if test "x$enable_load" = "xno" +#then +# AC_DEFINE(COLLECT_LOAD, 0, [Wether or not to collect system load statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_LOAD, test "x$enable_load" = "xyes") -AC_ARG_ENABLE(nfs, AC_HELP_STRING([--disable-nfs], [Disable nfs statistics]),, [enable_nfs="yes"]) -if test "x$enable_nfs" != "xno" -then - if test "x$ac_system" = "xLinux" - then - enable_nfs="yes" - else - enable_nfs="no" - fi -fi -if test "x$enable_nfs" = "xno" -then - AC_DEFINE(COLLECT_NFS, 0, [Wether or not to collect nfs statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_NFS, test "x$enable_nfs" = "xyes") +#AC_ARG_ENABLE(memory, AC_HELP_STRING([--disable-memory], [Disable memory statistics]),, [enable_memory="yes"]) +#if test "x$enable_memory" != "xno" +#then +# if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$with_libstatgrab" = "xyes" +# then +# enable_memory="yes" +# else +# enable_memory="no" +# fi +#fi +#if test "x$enable_memory" = "xno" +#then +# AC_DEFINE(COLLECT_MEMORY, 0, [Wether or not to collect memory statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_MEMORY, test "x$enable_memory" = "xyes") -AC_ARG_ENABLE(ping, AC_HELP_STRING([--disable-ping], [Disable ping statistics]),, [enable_ping="yes"]) -if test "x$enable_ping" != "xno" -then - enable_ping="yes" -fi -if test "x$enable_ping" = "xno" -then - AC_DEFINE(COLLECT_PING, 0, [Wether or not to collect ping statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_PING, test "x$enable_ping" = "xyes") +#AC_ARG_ENABLE(nfs, AC_HELP_STRING([--disable-nfs], [Disable nfs statistics]),, [enable_nfs="yes"]) +#if test "x$enable_nfs" != "xno" +#then +# if test "x$ac_system" = "xLinux" +# then +# enable_nfs="yes" +# else +# enable_nfs="no" +# fi +#fi +#if test "x$enable_nfs" = "xno" +#then +# AC_DEFINE(COLLECT_NFS, 0, [Wether or not to collect nfs statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_NFS, test "x$enable_nfs" = "xyes") -AC_ARG_ENABLE(processes, AC_HELP_STRING([--disable-processes], [Disable processes statistics]),, [enable_processes="yes"]) -if test "x$enable_processes" != "xno" -then - if test "x$ac_system" = "xLinux" - then - enable_processes="yes" - else - enable_processes="no" - fi -fi -if test "x$enable_processes" = "xno" -then - AC_DEFINE(COLLECT_PROCESSES, 0, [Wether or not to collect processes statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_PROCESSES, test "x$enable_processes" = "xyes") +#AC_ARG_ENABLE(ping, AC_HELP_STRING([--disable-ping], [Disable ping statistics]),, [enable_ping="yes"]) +#if test "x$enable_ping" != "xno" +#then +# enable_ping="yes" +#fi +#if test "x$enable_ping" = "xno" +#then +# AC_DEFINE(COLLECT_PING, 0, [Wether or not to collect ping statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_PING, test "x$enable_ping" = "xyes") -#AC_COLLECTD([quota], [enable], [module], [quota statistics (experimental)]) +#AC_ARG_ENABLE(processes, AC_HELP_STRING([--disable-processes], [Disable processes statistics]),, [enable_processes="yes"]) +#if test "x$enable_processes" != "xno" +#then +# if test "x$ac_system" = "xLinux" +# then +# enable_processes="yes" +# else +# enable_processes="no" +# fi +#fi +#if test "x$enable_processes" = "xno" +#then +# AC_DEFINE(COLLECT_PROCESSES, 0, [Wether or not to collect processes statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_PROCESSES, test "x$enable_processes" = "xyes") -AC_ARG_ENABLE(sensors, AC_HELP_STRING([--disable-sensors], [Disable lm_sensors statistics]),, [enable_sensors=$with_lm_sensors]) -if test "x$enable_sensors" != "xno" -then - if test "x$with_lm_sensors" = "xyes" - then - enable_sensors="yes" - else - enable_sensors="no" - fi -fi -if test "x$enable_sensors" = "xno" -then - AC_DEFINE(COLLECT_SENSORS, 0, [Wether or not to collect lm_sensors statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_SENSORS, test "x$enable_sensors" = "xyes") +##AC_COLLECTD([quota], [enable], [module], [quota statistics (experimental)]) -AC_ARG_ENABLE(serial, AC_HELP_STRING([--disable-serial], [Disable serial statistics]),, [enable_serial="yes"]) -if test "x$enable_serial" != "xno" -then - if test "x$ac_system" = "xLinux" - then - enable_serial="yes" - else - enable_serial="no" - fi -fi -if test "x$enable_serial" = "xno" -then - AC_DEFINE(COLLECT_SERIAL, 0, [Wether or not to collect serial statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_SERIAL, test "x$enable_serial" = "xyes") +#AC_ARG_ENABLE(sensors, AC_HELP_STRING([--disable-sensors], [Disable lm_sensors statistics]),, [enable_sensors=$with_lm_sensors]) +#if test "x$enable_sensors" != "xno" +#then +# if test "x$with_lm_sensors" = "xyes" +# then +# enable_sensors="yes" +# else +# enable_sensors="no" +# fi +#fi +#if test "x$enable_sensors" = "xno" +#then +# AC_DEFINE(COLLECT_SENSORS, 0, [Wether or not to collect lm_sensors statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_SENSORS, test "x$enable_sensors" = "xyes") -AC_ARG_ENABLE(swap, AC_HELP_STRING([--disable-swap], [Disable swap statistics]),, [enable_swap="yes"]) -if test "x$enable_swap" != "xno" -then - if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$with_libstatgrab" = "xyes" - then - enable_swap="yes" - else - enable_swap="no" - fi -fi -if test "x$enable_swap" = "xno" -then - AC_DEFINE(COLLECT_SWAP, 0, [Wether or not to collect swap statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_SWAP, test "x$enable_swap" = "xyes") +#AC_ARG_ENABLE(serial, AC_HELP_STRING([--disable-serial], [Disable serial statistics]),, [enable_serial="yes"]) +#if test "x$enable_serial" != "xno" +#then +# if test "x$ac_system" = "xLinux" +# then +# enable_serial="yes" +# else +# enable_serial="no" +# fi +#fi +#if test "x$enable_serial" = "xno" +#then +# AC_DEFINE(COLLECT_SERIAL, 0, [Wether or not to collect serial statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_SERIAL, test "x$enable_serial" = "xyes") -AC_ARG_ENABLE(tape, AC_HELP_STRING([--disable-tape], [Disable tape statistics]),, [enable_tape="yes"]) -if test "x$enable_tape" != "xno" -then - if test "x$with_kstat" = "xyes" - then - enable_tape="yes" - else - enable_tape="no" - fi -fi -if test "x$enable_tape" = "xno" -then - AC_DEFINE(COLLECT_TAPE, 0, [Wether or not to collect tape statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_TAPE, test "x$enable_tape" = "xyes") +#AC_ARG_ENABLE(swap, AC_HELP_STRING([--disable-swap], [Disable swap statistics]),, [enable_swap="yes"]) +#if test "x$enable_swap" != "xno" +#then +# if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$with_libstatgrab" = "xyes" +# then +# enable_swap="yes" +# else +# enable_swap="no" +# fi +#fi +#if test "x$enable_swap" = "xno" +#then +# AC_DEFINE(COLLECT_SWAP, 0, [Wether or not to collect swap statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_SWAP, test "x$enable_swap" = "xyes") -AC_ARG_ENABLE(traffic, AC_HELP_STRING([--disable-traffic], [Disable system traffic statistics]),, [enable_traffic="yes"]) -if test "x$enable_traffic" != "xno" -then - if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$with_libstatgrab" = "xyes" - then - enable_traffic="yes" - else - enable_traffic="no" - fi -fi -if test "x$enable_traffic" = "xno" -then - AC_DEFINE(COLLECT_TRAFFIC, 0, [Wether or not to collect network traffic statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_TRAFFIC, test "x$enable_traffic" = "xyes") +#AC_ARG_ENABLE(tape, AC_HELP_STRING([--disable-tape], [Disable tape statistics]),, [enable_tape="yes"]) +#if test "x$enable_tape" != "xno" +#then +# if test "x$with_kstat" = "xyes" +# then +# enable_tape="yes" +# else +# enable_tape="no" +# fi +#fi +#if test "x$enable_tape" = "xno" +#then +# AC_DEFINE(COLLECT_TAPE, 0, [Wether or not to collect tape statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_TAPE, test "x$enable_tape" = "xyes") -AC_COLLECTD([users], [disable], [module], [user count statistics]) +#AC_ARG_ENABLE(traffic, AC_HELP_STRING([--disable-traffic], [Disable system traffic statistics]),, [enable_traffic="yes"]) +#if test "x$enable_traffic" != "xno" +#then +# if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$with_libstatgrab" = "xyes" +# then +# enable_traffic="yes" +# else +# enable_traffic="no" +# fi +#fi +#if test "x$enable_traffic" = "xno" +#then +# AC_DEFINE(COLLECT_TRAFFIC, 0, [Wether or not to collect network traffic statistics]) +#fi +#AM_CONDITIONAL(BUILD_MODULE_TRAFFIC, test "x$enable_traffic" = "xyes") + +#AC_COLLECTD([users], [disable], [module], [user count statistics]) -AC_OUTPUT(Makefile src/libconfig/Makefile src/libping/Makefile src/Makefile) +AC_OUTPUT(Makefile src/libconfig/Makefile src/liboping/Makefile src/Makefile) cat <