X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=1c8617d31c02244d331e118fcd1e0ddc6ad57b8f;hb=2dfe97fd3c1ded52936cd974d5584a202c23761a;hp=e0ce88a0ebee70b25422d247bbe5e819904ad8c1;hpb=69a36d8615e8f6b07fc24ff4937e5f4a1c60e012;p=collectd.git diff --git a/configure.in b/configure.in index e0ce88a0..1c8617d3 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.alpha2) +AC_INIT(collectd, 3.8.1) 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 @@ -24,21 +25,112 @@ AC_SUBST(LIBLTDL) AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL #AC_PROG_RANLIB -AC_CONFIG_SUBDIRS(libltdl) +AC_CONFIG_SUBDIRS(libltdl src/libconfig) # # Checks for header files. # +AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_DIRENT +AC_CHECK_HEADERS(stdint.h) +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(errno.h) -AC_CHECK_HEADERS(syslog.h) +AC_CHECK_HEADERS(sys/param.h) + +# For ping library +AC_CHECK_HEADERS(netinet/in_systm.h, [], [], +[#if HAVE_STDINT_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/in.h, [], [], +[#if HAVE_STDINT_H +# include +#endif +#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/ip.h, [], [], +[#if HAVE_STDINT_H +# include +#endif +#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/ip_icmp.h, [], [], +[#if HAVE_STDINT_H +# include +#endif +#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_STDINT_H +# include +#endif +#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_STDINT_H +# include +#endif +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/icmp6.h, [], [], +[#if HAVE_STDINT_H +# include +#endif +#if HAVE_SYS_TYPES_H +# include +#endif +#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) @@ -46,10 +138,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) @@ -73,6 +161,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) @@ -88,6 +177,7 @@ AC_CHECK_LIB(m, ext) AC_C_CONST AC_TYPE_PID_T AC_TYPE_SIZE_T +AC_TYPE_UID_T AC_HEADER_TIME # @@ -96,19 +186,22 @@ 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) # 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"]) # For users module -have_getutent="no" -AC_CHECK_FUNCS(getutent getutxent, [have_getutent="yes"]) +AC_CHECK_FUNCS(getutent getutxent) # For quota module AC_CHECK_FUNCS(quotactl) @@ -116,8 +209,27 @@ 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_func_getmntent" = 'xyes'; then +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" AC_CACHE_CHECK([whether getmntent takes one argument], @@ -131,7 +243,7 @@ if test "x$ac_cv_func_getmntent" = 'xyes'; then [fu_cv_getmntent1=no] ) ) - if test "x$fu_cv_getmntent1" = 'xno'; then + if test "x$fu_cv_getmntent1" = "xno"; then AC_CACHE_CHECK([whether getmntent takes two arguments], [fu_cv_getmntent2], AC_COMPILE_IFELSE( @@ -147,7 +259,7 @@ if test "x$ac_cv_func_getmntent" = 'xyes'; then fi CFLAGS="$saveCFLAGS" fi -if test "x$fu_cv_getmntent1" = 'xyes'; then +if test "x$fu_cv_getmntent1" = "xyes"; then AC_DEFINE(HAVE_GETMNTENT1, 1, [Define if there is a function named getmntent @@ -156,7 +268,7 @@ if test "x$fu_cv_getmntent1" = 'xyes'; then SunOS, HP-UX, Dynix, Irix, Linux)] ) fi -if test "x$fu_cv_getmntent2" = 'xyes'; then +if test "x$fu_cv_getmntent2" = "xyes"; then AC_DEFINE(HAVE_GETMNTENT2, 1, [Define if there is a function named getmntent @@ -180,13 +292,28 @@ 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:]) # AC_ARG_WITH (package, help-string, [action-if-given], [action-if-not-given]) -AC_ARG_WITH(rrdtool, AC_HELP_STRING([--with-rrdtool=PFX], [Path to rrdtool.]), -[ if test "x$withval" != "xno" -a "x$withval" != "xyes" +AC_ARG_WITH(rrdtool, [AS_HELP_STRING([--with-rrdtool@<:@=PREFIX@:>@], [Path to rrdtool.])], +[ if test "x$withval" != "xno" && test "x$withval" != "xyes" then LDFLAGS="$LDFLAGS -L$withval/lib" CPPFLAGS="$CPPFLAGS -I$withval/include" @@ -195,16 +322,28 @@ AC_ARG_WITH(rrdtool, AC_HELP_STRING([--with-rrdtool=PFX], [Path to rrdtool.]), ], [with_rrdtool="yes"]) if test "x$with_rrdtool" = "xyes" then - AC_CHECK_LIB(rrd, rrd_update,, [with_rrdtool="no"], [-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 - AC_CHECK_HEADERS(rrd.h,, [with_rrdtool="no"]) + AC_CHECK_HEADERS(rrd.h,, [with_rrdtool="no (rrd.h not found)"]) +fi +if test "x$with_rrdtool" = "xyes" +then + collect_rrdtool=1 +else + collect_rrdtool=0 fi +AC_DEFINE_UNQUOTED(COLLECT_RRDTOOL, [$collect_rrdtool], + [Wether or not to use rrdtool library]) AM_CONDITIONAL(BUILD_WITH_RRDTOOL, test "x$with_rrdtool" = "xyes") -#AC_ARG_WITH(pth, AC_HELP_STRING([--with-pth=PFX], [Path to pth (experimental).]), -#[ if test "x$withval" != "xno" -a "x$withval" != "xyes" +#AC_ARG_WITH(pth, [AS_HELP_STRING([--with-pth=@<:@=PREFIX@:>@], [Path to pth (experimental).]), +#[ if test "x$withval" != "xno" && test "x$withval" != "xyes" # then # LDFLAGS="$LDFLAGS -L$withval/lib" # CPPFLAGS="$CPPFLAGS -I$withval/include" @@ -213,11 +352,11 @@ AM_CONDITIONAL(BUILD_WITH_RRDTOOL, test "x$with_rrdtool" = "xyes") #], [with_pth="no"]) #if test "x$with_pth" = "xyes" #then -# AC_CHECK_LIB(pth, pth_init,, [with_pth="no"], []) +# AC_CHECK_LIB(pth, pth_init,, [with_pth="no (libpth not found)"], []) #fi #if test "x$with_pth" = "xyes" #then -# AC_CHECK_HEADERS(pth.h,, [with_pth="no"]) +# AC_CHECK_HEADERS(pth.h,, [with_pth="no (pth.h not found)"]) #fi #if test "x$with_pth" = "xyes" #then @@ -232,58 +371,75 @@ AM_CONDITIONAL(BUILD_WITH_RRDTOOL, test "x$with_rrdtool" = "xyes") if test "$ac_system" = "Solaris" then with_kstat="yes" - AC_CHECK_LIB(kstat, kstat_open,, [with_kstat="no (not found)"]) +else + with_kstat="no (Solaris only)" +fi +if test "x$with_kstat" = "xyes" +then + AC_CHECK_LIB(kstat, kstat_open,, [with_kstat="no (libkstat not found)"]) +fi +if test "x$with_kstat" = "xyes" +then AC_CHECK_LIB(devinfo, di_init) AC_CHECK_HEADERS(kstat.h,, [with_kstat="no (kstat.h not found)"]) +fi +if test "x$with_kstat" = "xyes" +then + collect_kstat=1 else - with_kstat="no (Solaris only)" + collect_kstat=0 fi +AC_DEFINE_UNQUOTED(COLLECT_KSTAT, [$collect_kstat], + [Wether or not to use kstat library (Solaris)]) +AM_CONDITIONAL(BUILD_WITH_KSTAT, test "x$with_kstat" = "xyes") -AC_ARG_WITH(libstatgrab, AC_HELP_STRING([--with-libstatgrab@<:@=PFX@:>@], [Path to libstatgrab.]), +AC_ARG_WITH(libstatgrab, [AS_HELP_STRING([--with-libstatgrab@<:@=PREFIX@:>@], [Path to libstatgrab.])], [ - # given.. - if test "x$withval" != "xno" + if test "x$withval" != "xno" && test "x$withval" != "xyes" then - if test "x$withval" != "xyes" - then - LDFLAGS="$LDFLAGS -L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" - with_libstatgrab="yes" - fi + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" + with_libstatgrab="yes" fi ], [ - # not given.. - if test "x$ac_system" != "xunknown" + if test "x$ac_system" == "xunknown" then - with_libstatgrab="no" - else with_libstatgrab="yes" + else + with_libstatgrab="no" fi ]) if test "x$with_libstatgrab" = "xyes" then AC_CHECK_LIB(devstat, getdevs) AC_CHECK_LIB(kvm, kvm_getargv) - AC_CHECK_LIB(statgrab, sg_init,, [with_libstatgrab="no (not found)"]) - AC_CHECK_HEADERS(statgrab.h,, [with_libstatgrab="no (not found)"]) + AC_CHECK_LIB(statgrab, sg_init,, [with_libstatgrab="no (libstatgrab not found)"]) fi +if test "x$with_libstatgrab" = "xyes" +then + AC_CHECK_HEADERS(statgrab.h,, [with_libstatgrab="no (statgrab.h not found)"]) +fi +if test "x$with_libstatgrab" = "xyes" +then + collect_libstatgrab=1 +else + collect_libstatgrab=0 +fi +AC_DEFINE_UNQUOTED(COLLECT_LIBSTATGRAB, [$collect_libstatgrab], + [Wether or not to use statgrab library]) +AM_CONDITIONAL(BUILD_WITH_LIBSTATGRAB, test "x$with_libstatgrab" = "xyes") -AC_ARG_WITH(lm-sensors, AC_HELP_STRING([--with-lm-sensors@<:@=PFX@:>@], [Path to lm_sensors.]), +AC_ARG_WITH(lm-sensors, [AS_HELP_STRING([--with-lm-sensors@<:@=PREFIX@:>@], [Path to lm_sensors.])], [ - # given.. - if test "x$withval" != "xno" + if test "x$withval" != "xno" && test "x$withval" != "xyes" then - if test "x$withval" != "xyes" - then - LDFLAGS="$LDFLAGS -L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" - with_lm_sensors="yes" - fi + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" + with_lm_sensors="yes" fi ], [ - # not given.. if test "x$ac_system" = "xLinux" then with_lm_sensors="yes" @@ -295,314 +451,373 @@ if test "x$with_lm_sensors" = "xyes" then AC_CHECK_LIB(sensors, sensors_init, [ - with_lm_sensors="yes" AC_DEFINE(HAVE_LIBSENSORS, 1, [Define to 1 if you have the sensors library (-lsensors).]) ], - [with_lm_sensors="no (not found)"]) + [with_lm_sensors="no (libsensors not found)"]) +fi +if test "x$with_lm_sensors" = "xyes" +then AC_CHECK_HEADERS(sensors/sensors.h, [ - with_lm_sensors="yes" AC_DEFINE(HAVE_SENSORS_SENSORS_H, 1, [Define to 1 if you have the header file.]) ], - [with_lm_sensors="no (not found)"]) + [with_lm_sensors="no (sensors/sensors.h not found)"]) fi - - - -# -# Check for enabled/disabled features -# -m4_divert_once([HELP_ENABLE], [ -collectd features:]) -AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], - [Enable debugging (disabled by default)]), - [], [enable_debug="no"]) -if test "x$enable_debug" = "xno" -then - collect_debug=0 -else - if test "x$enable_debug" = "xyes" - then - collect_debug=1 - else - AC_MSG_NOTICE([Please specify either --enable-debug or --disable-debug; Enabling debugging.]) - collect_debug=1 - enable_debug="yes" - fi -fi -AC_DEFINE_UNQUOTED(COLLECT_DEBUG, [$collect_debug], - [Wether or not to enable debugging]) -AM_CONDITIONAL(BUILD_DEBUG, test "x$enable_debug" = "xyes") - -AC_ARG_ENABLE(daemon, AC_HELP_STRING([--disable-daemon], - [Disable daemon mode (enabled by default)]), - [], [enable_daemon="yes"]) -if test "x$enable_daemon" = "xno" +if test "x$with_lm_sensors" = "xyes" then - collect_daemon=0 + collect_lm_sensors=1 else - if test "x$enable_daemon" = "xyes" - then - collect_daemon=1 - else - AC_MSG_NOTICE([Please specify either --enable-daemon or --disable-daemon; Enabling daemon mode.]) - collect_daemon=1 - enable_daemon="yes" - fi + collect_lm_sensors=0 fi -AC_DEFINE_UNQUOTED(COLLECT_DAEMON, [$collect_daemon], - [Wether or not to enable daemon mode]) -AM_CONDITIONAL(BUILD_DAEMON, test "x$enable_daemon" = "xyes") +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") -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" +AC_ARG_WITH(libmysql, [AS_HELP_STRING([--with-libmysql@<:@=PREFIX@:>@], [Path to libmysql.])], +[ + if test "x$withval" != "xno" && test "x$withval" != "xyes" then - enable_cpu="yes" - else - enable_cpu="no" + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" + with_libmysql="yes" fi -fi -if test "x$enable_cpu" = "xno" +], +[ + with_libmysql="yes" +]) +if test "x$with_libmysql" = "xyes" then - AC_DEFINE(COLLECT_CPU, 0, [Wether or not to collect CPU usage statistics]) + 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 -AM_CONDITIONAL(BUILD_MODULE_CPU, test "x$enable_cpu" = "xyes") - -AC_ARG_ENABLE(cpufreq, AC_HELP_STRING([--disable-cpufreq], [Disable system cpu frequency statistics]),, [enable_cpufreq="yes"]) -if test "x$enable_cpufreq" != "xno" +if test "x$with_libmysql" = "xyes" then - if test "x$ac_system" = "xLinux" - then - enable_cpufreq="yes" - else - enable_cpufreq="no" - fi + 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$enable_cpufreq" = "xno" +if test "x$with_libmysql" = "xyes" then - AC_DEFINE(COLLECT_CPUFREQ, 0, [Wether or not to collect cpu frequency statistics]) + collect_libmysql=1 +else + collect_libmysql=0 fi -AM_CONDITIONAL(BUILD_MODULE_CPUFREQ, test "x$enable_cpufreq" = "xyes") +AC_DEFINE_UNQUOTED(COLLECT_LIBMYSQL, [$collect_libmysql], + [Wether or not to use mysql library]) +AM_CONDITIONAL(BUILD_WITH_LIBMYSQL, test "x$with_libmysql" = "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" +# +# Check for enabled/disabled features +# + +# AC_COLLECTD(name, enable/disable, info-text, feature/module) +# ------------------------------------------------------------ +dnl +m4_define([my_toupper], [m4_translit([$1], m4_defn([m4_cr_letters]), m4_defn([m4_cr_LETTERS]))]) +dnl +AC_DEFUN( + [AC_COLLECTD], + [ + m4_if([$1], [], [AC_FATAL([AC_COLLECTD([$1], [$2], [$3], [$4]): 1st argument must not be empty])])dnl + m4_if( + [$2], + [enable], + [dnl + m4_define([EnDis],[disabled])dnl + m4_define([YesNo],[no])dnl + ],dnl + [m4_if( + [$2], + [disable], + [dnl + m4_define([EnDis],[enabled])dnl + m4_define([YesNo],[yes])dnl + ], + [dnl + AC_FATAL([AC_COLLECTD([$1], [$2], [$3], [$4]): 2nd argument must be either enable or disable])dnl + ]dnl + )]dnl + )dnl + m4_if([$3], [feature], [], + [m4_if( + [$3], [module], [], + [dnl + AC_FATAL([AC_COLLECTD([$1], [$2], [$3], [$4]): 3rd argument must be either feature or disable])dnl + ]dnl + )]dnl + )dnl + AC_ARG_ENABLE( + [$1], + AS_HELP_STRING([--$2-$1], [$2 $4 (EnDis by def)]), + [], + enable_$1='[YesNo]'dnl + )# AC_ARG_ENABLE +if test "x$enable_$1" = "xno" +then + collectd_$1=0 +else + if test "x$enable_$1" = "xyes" then - enable_disk="yes" + collectd_$1=1 else - enable_disk="no" + AC_MSG_NOTICE([please specify either --enable-$1 or --disable-$1; enabling $1.]) + collectd_$1=1 + enable_$1='yes' 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_DEFINE_UNQUOTED([COLLECT_]my_toupper([$1]), [$collectd_$1], [wether or not to enable $3 $4]) + AM_CONDITIONAL([BUILD_]my_toupper([$3])[_]my_toupper([$1]), [test "x$enable_$1" = "xyes"])dnl + ]dnl +)# AC_COLLECTD(name, enable/disable, info-text, feature/module) -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") +m4_divert_once([HELP_ENABLE], [ +collectd features:]) +AC_COLLECTD([debug], [enable], [feature], [debugging]) +AC_COLLECTD([daemon], [disable], [feature], [daemon mode]) -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") +m4_divert_once([HELP_ENABLE], [ +collectd modules:]) +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]) + +#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(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(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(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(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(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(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(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(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(quota, AC_HELP_STRING([--enable-quota], -# [Enable quota statistics (experimental, disabled by default)]), -# [], [enable_quota="no"]) -#if test "x$enable_quota" = "xno" +#AC_ARG_ENABLE(memory, AC_HELP_STRING([--disable-memory], [Disable memory statistics]),, [enable_memory="yes"]) +#if test "x$enable_memory" != "xno" #then -# collect_quota=0 -#else -# if test "x$enable_quota" = "xyes" +# if test "x$ac_system" = "xLinux" -o "x$with_kstat" = "xyes" -o "x$with_libstatgrab" = "xyes" # then -# collect_quota=1 +# enable_memory="yes" # else -# AC_MSG_NOTICE([Please specify either --enable-quota or --disable-quota; Enabling quota statistics.]) -# collect_quota=1 -# enable_quota="yes" +# enable_memory="no" # fi #fi -#AC_DEFINE_UNQUOTED(COLLECT_QUOTA, [$collect_quota], -# [Wether or not to collect quota statistics]) -#AM_CONDITIONAL(BUILD_MODULE_QUOTA, test "x$enable_quota" = "xyes") +#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(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(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(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(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(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(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(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([quota], [enable], [module], [quota statistics (experimental)]) -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(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(users, AC_HELP_STRING([--disable-users], [Disable user count statistics]),, [enable_users="yes"]) -if test "x$enable_users" != "xno" -then - if test "x$have_getutent" = "xyes" - then - enable_users="yes" - else - enable_users="no" - fi -fi -if test "x$enable_users" = "xno" -then - AC_DEFINE(COLLECT_USERS, 0, [Wether or not to collect user count statistics]) -fi -AM_CONDITIONAL(BUILD_MODULE_USERS, test "x$enable_users" = "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(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(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(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/libping/Makefile src/Makefile) +AC_OUTPUT(Makefile src/libconfig/Makefile src/liboping/Makefile src/Makefile) cat <