From a905d397250bdcc9ae780c32fe36120267c17d82 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sun, 1 Jul 2007 17:28:26 +0200 Subject: [PATCH] build system: Do dependency checking in the configure script. The plan is to remove the dependency defines from the plugins and do all that in the configure script from now on. --- configure.in | 392 +++++++++++++++++++++++++++--------------------- src/Makefile.am | 147 +++++++----------- 2 files changed, 276 insertions(+), 263 deletions(-) diff --git a/configure.in b/configure.in index cf423edc..97bf9737 100644 --- a/configure.in +++ b/configure.in @@ -36,23 +36,8 @@ AC_CONFIG_SUBDIRS(libltdl) AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_DIRENT -AC_CHECK_HEADERS(stdint.h) -AC_CHECK_HEADERS(stdio.h) -AC_CHECK_HEADERS(errno.h) -AC_CHECK_HEADERS(math.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(poll.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(kstat.h) + +AC_CHECK_HEADERS(stdint.h stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h) # For ping library AC_CHECK_HEADERS(netinet/in_systm.h, [], [], @@ -189,33 +174,13 @@ AC_CHECK_HEADERS(netinet/udp.h, [], [], ]) # For cpu modules -AC_CHECK_HEADERS(sys/sysctl.h sys/dkstat.h) -AC_CHECK_HEADERS(mach/mach_init.h) -AC_CHECK_HEADERS(mach/host_priv.h) -AC_CHECK_HEADERS(mach/mach_error.h) -AC_CHECK_HEADERS(mach/mach_host.h) -AC_CHECK_HEADERS(mach/mach_port.h) -AC_CHECK_HEADERS(mach/mach_types.h) -AC_CHECK_HEADERS(mach/message.h) -AC_CHECK_HEADERS(mach/processor_set.h) -AC_CHECK_HEADERS(mach/processor.h) -AC_CHECK_HEADERS(mach/processor_info.h) -AC_CHECK_HEADERS(mach/task.h) -AC_CHECK_HEADERS(mach/thread_act.h) -AC_CHECK_HEADERS(mach/vm_region.h) -AC_CHECK_HEADERS(mach/vm_map.h) -AC_CHECK_HEADERS(mach/vm_prot.h) -AC_CHECK_HEADERS(mach/vm_statistics.h) -AC_CHECK_HEADERS(mach/kern_return.h) +AC_CHECK_HEADERS(sys/sysctl.h sys/dkstat.h mach/mach_init.h mach/host_priv.h mach/mach_error.h mach/mach_host.h mach/mach_port.h mach/mach_types.h mach/message.h mach/processor_set.h mach/processor.h mach/processor_info.h mach/task.h mach/thread_act.h mach/vm_region.h mach/vm_map.h mach/vm_prot.h mach/vm_statistics.h mach/kern_return.h) # For hddtemp module -AC_CHECK_HEADERS(linux/major.h) -AC_CHECK_HEADERS(libgen.h) +AC_CHECK_HEADERS(linux/major.h libgen.h) # For the apple_sensors module -AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h) -AC_CHECK_HEADERS(IOKit/IOKitLib.h) -AC_CHECK_HEADERS(IOKit/IOTypes.h) +AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h IOKit/IOKitLib.h IOKit/IOTypes.h IOKit/ps/IOPSKeys.h IOKit/IOBSD.h IOKit/storage/IOBlockStorageDriver.h) # For the battery plugin AC_CHECK_HEADERS(IOKit/ps/IOPowerSources.h, [], [], @@ -227,24 +192,12 @@ AC_CHECK_HEADERS(IOKit/ps/IOPowerSources.h, [], [], # include #endif ]) -AC_CHECK_HEADERS(IOKit/ps/IOPSKeys.h) - -# For the `disk' plugin -AC_CHECK_HEADERS(IOKit/IOBSD.h) -AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDriver.h) # For load module -AC_CHECK_HEADERS(sys/loadavg.h) - # For the processes plugin -AC_CHECK_HEADERS(linux/config.h) - # For the swap module -AC_CHECK_HEADERS(sys/swap.h) - # For users module -AC_CHECK_HEADERS(utmp.h) -AC_CHECK_HEADERS(utmpx.h) +AC_CHECK_HEADERS(sys/loadavg.h linux/config.h sys/swap.h utmp.h utmpx.h) # For interface plugin AC_CHECK_HEADERS(ifaddrs.h) @@ -280,52 +233,9 @@ AC_CHECK_HEADERS(linux/netdevice.h, [], [], ]) # For apache plugin -AC_CHECK_HEADERS(curl/curl.h) - -# For quota module -AC_CHECK_HEADERS(pwd.h sys/ucred.h) -AC_CHECK_HEADERS(ctype.h) -AC_CHECK_HEADERS(limits.h) -AC_CHECK_HEADERS(sys/quota.h) -AC_CHECK_HEADERS(xfs/xqm.h) - # For mount interface -AC_CHECK_HEADERS(fs_info.h) -AC_CHECK_HEADERS(fshelp.h) -AC_CHECK_HEADERS(paths.h) -AC_CHECK_HEADERS(mntent.h) -AC_CHECK_HEADERS(mnttab.h) -AC_CHECK_HEADERS(sys/fstyp.h) -AC_CHECK_HEADERS(sys/fs_types.h) -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) - -# For the swap plugin, FreeBSD -AC_CHECK_HEADERS(kvm.h) - -# For the email plugin -AC_CHECK_HEADERS(linux/un.h, [], [], -[ -#if HAVE_SYS_SOCKET_H -# include -#endif -]) -AC_CHECK_HEADERS(sys/un.h) -AC_CHECK_HEADERS(grp.h) - -# For debugging interface (variable number of arguments) -AC_CHECK_HEADERS(stdarg.h) - -# Regular expressions for the ignorelist. -AC_CHECK_HEADERS(regex.h) - # For the dns plugin -AC_CHECK_HEADERS(arpa/nameser.h arpa/nameser_compat.h) +AC_CHECK_HEADERS(curl/curl.h pwd.h grp.h sys/un.h sys/ucred.h ctype.h limits.h sys/quota.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/mount.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h kvm.h arpa/nameser.h arpa/nameser_compat.h) AC_CHECK_HEADERS(net/if_arp.h, [], [], [#if HAVE_SYS_SOCKET_H @@ -357,8 +267,7 @@ AC_CHECK_HEADERS(netinet/if_ether.h, [], [], ]) # For the multimeter plugin -AC_CHECK_HEADERS(termios.h) -AC_CHECK_HEADERS(sys/ioctl.h) +AC_CHECK_HEADERS(termios.h sys/ioctl.h) # # Checking for libraries @@ -378,11 +287,7 @@ AC_HEADER_TIME # Checks for library functions. # AC_PROG_GCC_TRADITIONAL -AC_CHECK_FUNCS(gettimeofday select strdup strtol) -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) +AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog) socket_needs_socket="no" AC_CHECK_FUNCS(socket, [], AC_CHECK_LIB(socket, socket, [socket_needs_socket="yes"], AC_MSG_ERROR(cannot find socket))) @@ -392,31 +297,22 @@ nanosleep_needs_rt="no" AC_CHECK_FUNCS(nanosleep, [], AC_CHECK_LIB(rt, nanosleep, [nanosleep_needs_rt="yes"], AC_MSG_ERROR(cannot find nanosleep))) AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes") -# Regular expressions for the ignorelist. AC_CHECK_FUNCS(regcomp regerror regexec regfree) -# For cpu module AC_CHECK_FUNCS(sysctlbyname, [have_sysctlbyname="yes"], [have_sysctlbyname="no"]) - -# For df module -AC_CHECK_FUNCS(statfs statvfs) +AC_CHECK_FUNCS(host_statistics, [have_host_statistics="yes"], [have_host_statistics="no"]) +AC_CHECK_FUNCS(processor_info, [have_processor_info="yes"], [have_processor_info="no"]) +AC_CHECK_FUNCS(thread_info, [have_thread_info="yes"], [have_thread_info="no"]) +AC_CHECK_FUNCS(statfs, [have_statfs="yes"], [have_statfs="no"]) +AC_CHECK_FUNCS(statvfs, [have_statvfs="yes"], [have_statvfs="no"]) +AC_CHECK_FUNCS(getifaddrs, [have_getifaddrs="yes"], [have_getifaddrs="no"]) +AC_CHECK_FUNCS(syslog, [have_syslog="yes"], [have_syslog="no"]) +AC_CHECK_FUNCS(getutent, [have_getutent="yes"], [have_getutent="no"]) +AC_CHECK_FUNCS(getutxent, [have_getutxent="yes"], [have_getutxent="no"]) # For load module AC_CHECK_FUNCS(getloadavg, [have_getloadavg="yes"], [have_getloadavg="no"]) -# For the `processes' plugin -AC_CHECK_FUNCS(thread_info) - -# For users module -AC_CHECK_FUNCS(getutent getutxent) - -# For quota module -AC_CHECK_FUNCS(quotactl) -AC_CHECK_FUNCS(getgrgid getpwuid) - -# For interface module -AC_CHECK_FUNCS(getifaddrs) - # Check for NAN AC_ARG_WITH(nan-emulation, [AS_HELP_STRING([--with-nan-emulation], [use emulated NAN. For crosscompiling only.])], [ @@ -1101,10 +997,6 @@ then fi AM_CONDITIONAL(BUILD_WITH_LIBOPING, test "x$with_liboping" = "xyes") AM_CONDITIONAL(BUILD_WITH_OWN_LIBOPING, test "x$with_own_liboping" = "xyes") -if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes" -then - with_liboping="yes (shipped version)" -fi AC_ARG_WITH(libpcap, [AS_HELP_STRING([--with-libpcap@<:@=PREFIX@:>@], [Path to libpcap.])], [ @@ -1423,58 +1315,221 @@ fi ]dnl )# AC_COLLECTD(name, enable/disable, info-text, feature/module) +# AC_PLUGIN(name, default, info) +# ------------------------------------------------------------ +dnl +AC_DEFUN( + [AC_PLUGIN], + [ + enable_plugin="no" + AC_ARG_ENABLE([$1], AC_HELP_STRING([--enable-$1], [$3]), + [ + if test "x$enableval" = "xyes" + then + enable_plugin="yes" + else + enable_plugin="no" + fi + ], + [ + if test "x$2" = "xyes" + then + enable_plugin="yes" + else + enable_plugin="no" + fi + ]) + if test "x$enable_plugin" = "xyes" + then + AC_DEFINE([HAVE_PLUGIN_]my_toupper([$1]), 1, [Define to 1 if the $1 plugin is enabled.]) + fi + AM_CONDITIONAL([BUILD_PLUGIN_]my_toupper([$1]), test "x$enable_plugin" = "xyes") + enable_$1="$enable_plugin" + ] +)# AC_PLUGIN(name, default, info) + m4_divert_once([HELP_ENABLE], [ collectd features:]) +# FIXME: Remove these calls to `AC_COLLECTD' and then remove that macro. AC_COLLECTD([debug], [enable], [feature], [debugging]) AC_COLLECTD([daemon], [disable], [feature], [daemon mode]) AC_COLLECTD([getifaddrs],[enable], [feature], [getifaddrs under Linux]) +plugin_battery="no" +plugin_cpu="no" +plugin_cpufreq="no" +plugin_df="no" +plugin_disk="no" +plugin_entropy="no" +plugin_interface="no" +plugin_irq="no" +plugin_load="no" +plugin_memory="no" +plugin_nfs="no" +plugin_processes="no" +plugin_serial="no" +plugin_swap="no" +plugin_tape="no" +plugin_users="no" +plugin_vserver="no" +plugin_wireless="no" + +# Linux +if test "x$ac_system" = "xLinux" +then + plugin_battery="yes" + plugin_cpu="yes" + plugin_cpufreq="yes" + plugin_disk="yes" + plugin_entropy="yes" + plugin_interface="yes" + plugin_irq="yes" + plugin_load="yes" + plugin_memory="yes" + plugin_nfs="yes" + plugin_processes="yes" + plugin_serial="yes" + plugin_swap="yes" + plugin_vserver="yes" + plugin_wireless="yes" +fi + +# Mac OS X devices +if test "x$with_libiokit" = "xyes" +then + plugin_battery="yes" + plugin_disk="yes" +fi + +# Solaris +if test "x$with_devinfo$with_kstat" = "xyesyes" +then + plugin_cpu="yes" + plugin_disk="yes" + plugin_interface="yes" + plugin_memory="yes" + plugin_swap="yes" + plugin_tape="yes" +fi + +# libstatgrab +if test "x$with_libstatgrab" = "xyes" +then + plugin_interface="yes" + plugin_load="yes" + plugin_memory="yes" + plugin_swap="yes" +fi + +if test "x$have_processor_info" = "xyes" +then + plugin_cpu="yes" +fi +if test "x$have_sysctlbyname" = "xyes" +then + plugin_cpu="yes" + plugin_memory="yes" +fi + +if test "x$have_statfs" = "xyes" +then + plugin_df="yes" +fi +if test "x$have_statvfs" = "xyes" +then + plugin_df="yes" +fi + +if test "x$have_getifaddrs" = "xyes" +then + plugin_interface="yes" +fi + +if test "x$have_getloadavg" = "xyes" +then + plugin_load="yes" +fi + +# Mac OS X memory interface +if test "x$have_host_statistics" = "xyes" +then + plugin_memory="yes" +fi + +if test "x$have_thread_info" = "xyes" +then + plugin_processes="yes" +fi + +if test "x$with_libkvm" = "xyes" +then + plugin_swap="yes" +fi + +if test "x$have_getutent" = "xyes" +then + plugin_users="yes" +fi +if test "x$have_getutxent" = "xyes" +then + plugin_users="yes" +fi + +# FIXME: sysctl for swap plugin + m4_divert_once([HELP_ENABLE], [ -collectd modules:]) -AC_COLLECTD([apache], [disable], [module], [Apache httpd statistics]) -AC_COLLECTD([apcups], [disable], [module], [Statistics of UPSes by APC]) -AC_COLLECTD([apple_sensors], [disable], [module], [Apple's hardware sensors]) -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([csv], [disable], [module], [csv output plugin]) -AC_COLLECTD([df], [disable], [module], [df statistics]) -AC_COLLECTD([dns], [disable], [module], [dns statistics]) -AC_COLLECTD([email], [disable], [module], [email statistics]) -AC_COLLECTD([entropy], [disable], [module], [entropy statistics]) -AC_COLLECTD([exec], [disable], [module], [exec of external programs]) -AC_COLLECTD([hddtemp], [disable], [module], [hdd temperature statistics]) -AC_COLLECTD([interface], [disable], [module], [interface statistics]) -AC_COLLECTD([iptables], [disable], [module], [IPtables statistics]) -AC_COLLECTD([irq], [disable], [module], [irq statistics]) -AC_COLLECTD([load], [disable], [module], [system load statistics]) -AC_COLLECTD([mbmon], [disable], [module], [motherboard monitor statistics]) -AC_COLLECTD([memory], [disable], [module], [memory statistics]) -AC_COLLECTD([multimeter],[disable], [module], [multimeter statistics]) -AC_COLLECTD([mysql], [disable], [module], [mysql statistics]) -AC_COLLECTD([network], [disable], [module], [network functionality]) -AC_COLLECTD([nfs], [disable], [module], [nfs statistics]) -AC_COLLECTD([ntpd], [disable], [module], [ntpd statistics]) -AC_COLLECTD([nut], [disable], [module], [network UPS tools statistics]) -AC_COLLECTD([perl], [disable], [module], [embedded perl interpreter]) -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([snmp], [disable], [module], [serial statistics]) -AC_COLLECTD([logfile], [disable], [module], [logfile log facility]) -AC_COLLECTD([swap], [disable], [module], [swap statistics]) -AC_COLLECTD([syslog], [disable], [module], [syslog log facility]) -AC_COLLECTD([tape], [disable], [module], [tape statistics]) -AC_COLLECTD([unixsock], [disable], [module], [UNIX socket plugin]) -AC_COLLECTD([users], [disable], [module], [user count statistics]) -AC_COLLECTD([vserver], [disable], [module], [vserver statistics]) -AC_COLLECTD([wireless], [disable], [module], [wireless link statistics]) -AC_COLLECTD([xmms], [disable], [module], [wireless link statistics]) +collectd plugins:]) + +AC_PLUGIN([apache], [$with_libcurl], [Apache httpd statistics]) +AC_PLUGIN([apcups], [yes], [Statistics of UPSes by APC]) +AC_PLUGIN([apple_sensors], [$with_libiokit], [Apple's hardware sensors]) +AC_PLUGIN([battery], [$plugin_battery], [Battery statistics]) +AC_PLUGIN([cpu], [$plugin_cpu], [CPU usage statistics]) +AC_PLUGIN([cpufreq], [$plugin_cpufreq], [CPU frequency statistics]) +AC_PLUGIN([csv], [yes], [CSV output plugin]) +AC_PLUGIN([df], [$plugin_df], [Filesystem usage statistics]) +AC_PLUGIN([disk], [$plugin_disk], [Disk usage statistics]) +AC_PLUGIN([dns], [$with_libpcap], [DNS traffic analysis]) +AC_PLUGIN([email], [yes], [EMail statistics]) +AC_PLUGIN([entropy], [$plugin_entropy], [Entropy statistics]) +AC_PLUGIN([exec], [yes], [Execution of external programs]) +AC_PLUGIN([hddtemp], [yes], [Query hddtempd]) +AC_PLUGIN([interface], [$plugin_interface], [Interface traffic statistics]) +AC_PLUGIN([iptables], [$with_libiptc], [IPTables rule counters]) +AC_PLUGIN([irq], [$plugin_irq], [IRQ statistics]) +AC_PLUGIN([load], [$plugin_load], [System load]) +AC_PLUGIN([logfile], [yes], [File logging plugin]) +AC_PLUGIN([mbmon], [yes], [Query mbmond]) +AC_PLUGIN([memory], [$plugin_memory], [Memory usage]) +AC_PLUGIN([multimeter], [no], [Read multimeter values]) +AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics]) +AC_PLUGIN([network], [yes], [Network communication plugin]) +AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics]) +AC_PLUGIN([ntpd], [yes], [NTPd statistics]) +AC_PLUGIN([nut], [$with_libupsclient], [Network UPS tools statistics]) +AC_PLUGIN([perl], [$with_libperl], [Embed a Perl interpreter]) +AC_PLUGIN([ping], [$with_liboping], [Network latency statistics]) +AC_PLUGIN([processes], [$plugin_processes], [Process statistics]) +AC_PLUGIN([rrdtool], [$with_rrdtool], [RRDTool output plugin]) +AC_PLUGIN([sensors], [$with_lm_sensors], [lm_sensors statistics]) +AC_PLUGIN([serial], [$plugin_serial], [serial port traffic]) +AC_PLUGIN([snmp], [$with_libnetsnmp], [SNMP querying plugin]) +AC_PLUGIN([swap], [$plugin_swap], [Swap usage statistics]) +AC_PLUGIN([syslog], [$have_syslog], [Syslog logging plugin]) +AC_PLUGIN([tape], [$plugin_tape], [Tape drive statistics]) +AC_PLUGIN([unixsock], [yes], [Unixsock communication plugin]) +AC_PLUGIN([users], [$plugin_users], [User statistics]) +AC_PLUGIN([vserver], [$plugin_vserver], [Linux VServer statistics]) +AC_PLUGIN([wireless], [$plugin_wireless], [Wireless statistics]) +AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics]) AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/liboconfig/Makefile src/liboping/Makefile) +if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes" +then + with_liboping="yes (shipped version)" +fi + if test "x$with_libperl" = "xyes" then with_libperl="yes (version `perl -MConfig -e 'print $Config{version};'`)" @@ -1490,6 +1545,7 @@ Configuration: libiokit . . . . . $with_libiokit libiptc . . . . . . $with_libiptc libkstat . . . . . $with_kstat + libkvm . . . . . . $with_libkvm libmysql . . . . . $with_libmysql libnetsnmp . . . . $with_libnetsnmp liboconfig . . . . $with_liboconfig diff --git a/src/Makefile.am b/src/Makefile.am index d92ef96e..458c138b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -81,18 +81,15 @@ endif pkglib_LTLIBRARIES = -if BUILD_MODULE_APACHE +if BUILD_PLUGIN_APACHE pkglib_LTLIBRARIES += apache.la apache_la_SOURCES = apache.c -apache_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_LIBCURL -apache_la_LDFLAGS += $(BUILD_WITH_LIBCURL_LIBS) -endif +apache_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBCURL_LIBS) collectd_LDADD += "-dlopen" apache.la collectd_DEPENDENCIES += apache.la endif -if BUILD_MODULE_APCUPS +if BUILD_PLUGIN_APCUPS pkglib_LTLIBRARIES += apcups.la apcups_la_SOURCES = apcups.c apcups_la_LDFLAGS = -module -avoid-version @@ -103,18 +100,15 @@ collectd_LDADD += "-dlopen" apcups.la collectd_DEPENDENCIES += apcups.la endif -if BUILD_MODULE_APPLE_SENSORS +if BUILD_PLUGIN_APPLE_SENSORS pkglib_LTLIBRARIES += apple_sensors.la apple_sensors_la_SOURCES = apple_sensors.c -apple_sensors_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_LIBIOKIT -apple_sensors_la_LDFLAGS += -lIOKit -endif +apple_sensors_la_LDFLAGS = -module -avoid-version -lIOKit collectd_LDADD += "-dlopen" apple_sensors.la collectd_DEPENDENCIES += apple_sensors.la endif -if BUILD_MODULE_BATTERY +if BUILD_PLUGIN_BATTERY pkglib_LTLIBRARIES += battery.la battery_la_SOURCES = battery.c battery_la_LDFLAGS = -module -avoid-version @@ -125,7 +119,7 @@ collectd_LDADD += "-dlopen" battery.la collectd_DEPENDENCIES += battery.la endif -if BUILD_MODULE_CPU +if BUILD_PLUGIN_CPU pkglib_LTLIBRARIES += cpu.la cpu_la_SOURCES = cpu.c cpu_la_LDFLAGS = -module -avoid-version @@ -139,7 +133,7 @@ collectd_LDADD += "-dlopen" cpu.la collectd_DEPENDENCIES += cpu.la endif -if BUILD_MODULE_CPUFREQ +if BUILD_PLUGIN_CPUFREQ pkglib_LTLIBRARIES += cpufreq.la cpufreq_la_SOURCES = cpufreq.c cpufreq_la_LDFLAGS = -module -avoid-version @@ -147,7 +141,7 @@ collectd_LDADD += "-dlopen" cpufreq.la collectd_DEPENDENCIES += cpufreq.la endif -if BUILD_MODULE_CSV +if BUILD_PLUGIN_CSV pkglib_LTLIBRARIES += csv.la csv_la_SOURCES = csv.c csv_la_LDFLAGS = -module -avoid-version @@ -155,7 +149,7 @@ collectd_LDADD += "-dlopen" csv.la collectd_DEPENDENCIES += csv.la endif -if BUILD_MODULE_DF +if BUILD_PLUGIN_DF pkglib_LTLIBRARIES += df.la df_la_SOURCES = df.c df_la_LDFLAGS = -module -avoid-version @@ -163,7 +157,7 @@ collectd_LDADD += "-dlopen" df.la collectd_DEPENDENCIES += df.la endif -if BUILD_MODULE_DISK +if BUILD_PLUGIN_DISK pkglib_LTLIBRARIES += disk.la disk_la_SOURCES = disk.c disk_la_LDFLAGS = -module -avoid-version @@ -180,26 +174,15 @@ collectd_LDADD += "-dlopen" disk.la collectd_DEPENDENCIES += disk.la endif -if BUILD_MODULE_DNS +if BUILD_PLUGIN_DNS pkglib_LTLIBRARIES += dns.la -dns_la_SOURCES = dns.c -if BUILD_WITH_LIBPCAP -if BUILD_WITH_LIBPTHREAD -dns_la_SOURCES += utils_dns.c utils_dns.h -endif -endif -dns_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_LIBPCAP -dns_la_LDFLAGS += -lpcap -endif -if BUILD_WITH_LIBPTHREAD -dns_la_LDFLAGS += -lpthread -endif +dns_la_SOURCES = dns.c utils_dns.c utils_dns.h +dns_la_LDFLAGS = -module -avoid-version -lpcap -lpthread collectd_LDADD += "-dlopen" dns.la collectd_DEPENDENCIES += dns.la endif -if BUILD_MODULE_EMAIL +if BUILD_PLUGIN_EMAIL pkglib_LTLIBRARIES += email.la email_la_SOURCES = email.c email_la_LDFLAGS = -module -avoid-version @@ -210,7 +193,7 @@ collectd_LDADD += "-dlopen" email.la collectd_DEPENDENCIES += email.la endif -if BUILD_MODULE_ENTROPY +if BUILD_PLUGIN_ENTROPY pkglib_LTLIBRARIES += entropy.la entropy_la_SOURCES = entropy.c entropy_la_LDFLAGS = -module -avoid-version @@ -218,7 +201,7 @@ collectd_LDADD += "-dlopen" entropy.la collectd_DEPENDENCIES += entropy.la endif -if BUILD_MODULE_EXEC +if BUILD_PLUGIN_EXEC pkglib_LTLIBRARIES += exec.la exec_la_SOURCES = exec.c exec_la_LDFLAGS = -module -avoid-version @@ -229,7 +212,7 @@ collectd_LDADD += "-dlopen" exec.la collectd_DEPENDENCIES += exec.la endif -if BUILD_MODULE_HDDTEMP +if BUILD_PLUGIN_HDDTEMP pkglib_LTLIBRARIES += hddtemp.la hddtemp_la_SOURCES = hddtemp.c hddtemp_la_LDFLAGS = -module -avoid-version @@ -240,7 +223,7 @@ collectd_LDADD += "-dlopen" hddtemp.la collectd_DEPENDENCIES += hddtemp.la endif -if BUILD_MODULE_INTERFACE +if BUILD_PLUGIN_INTERFACE pkglib_LTLIBRARIES += interface.la interface_la_SOURCES = interface.c interface_la_LDFLAGS = -module -avoid-version @@ -263,18 +246,15 @@ interface_la_LDFLAGS += -lstatgrab endif endif -if BUILD_MODULE_IPTABLES +if BUILD_PLUGIN_IPTABLES pkglib_LTLIBRARIES += iptables.la iptables_la_SOURCES = iptables.c -iptables_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_LIBIPTC -iptables_la_LDFLAGS += -liptc -endif +iptables_la_LDFLAGS = -module -avoid-version -liptc collectd_LDADD += "-dlopen" iptables.la collectd_DEPENDENCIES += iptables.la endif -if BUILD_MODULE_IRQ +if BUILD_PLUGIN_IRQ pkglib_LTLIBRARIES += irq.la irq_la_SOURCES = irq.c irq_la_LDFLAGS = -module -avoid-version @@ -282,7 +262,7 @@ collectd_LDADD += "-dlopen" irq.la collectd_DEPENDENCIES += irq.la endif -if BUILD_MODULE_LOAD +if BUILD_PLUGIN_LOAD pkglib_LTLIBRARIES += load.la load_la_SOURCES = load.c load_la_LDFLAGS = -module -avoid-version @@ -299,7 +279,7 @@ load_la_LDFLAGS += -lstatgrab endif endif -if BUILD_MODULE_LOGFILE +if BUILD_PLUGIN_LOGFILE pkglib_LTLIBRARIES += logfile.la logfile_la_SOURCES = logfile.c logfile_la_LDFLAGS = -module -avoid-version @@ -307,7 +287,7 @@ collectd_LDADD += "-dlopen" logfile.la collectd_DEPENDENCIES += logfile.la endif -if BUILD_MODULE_MBMON +if BUILD_PLUGIN_MBMON pkglib_LTLIBRARIES += mbmon.la mbmon_la_SOURCES = mbmon.c mbmon_la_LDFLAGS = -module -avoid-version @@ -318,7 +298,7 @@ collectd_LDADD += "-dlopen" mbmon.la collectd_DEPENDENCIES += mbmon.la endif -if BUILD_MODULE_MEMORY +if BUILD_PLUGIN_MEMORY pkglib_LTLIBRARIES += memory.la memory_la_SOURCES = memory.c memory_la_LDFLAGS = -module -avoid-version @@ -341,7 +321,7 @@ memory_la_LDFLAGS += -lstatgrab endif endif -if BUILD_MODULE_MULTIMETER +if BUILD_PLUGIN_MULTIMETER pkglib_LTLIBRARIES += multimeter.la multimeter_la_SOURCES = multimeter.c multimeter_la_LDFLAGS = -module -avoid-version @@ -349,18 +329,15 @@ collectd_LDADD += "-dlopen" multimeter.la collectd_DEPENDENCIES += multimeter.la endif -if BUILD_MODULE_MYSQL +if BUILD_PLUGIN_MYSQL pkglib_LTLIBRARIES += mysql.la mysql_la_SOURCES = mysql.c -mysql_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_LIBMYSQL -mysql_la_LDFLAGS += -lmysqlclient -endif +mysql_la_LDFLAGS = -module -avoid-version -lmysqlclient collectd_LDADD += "-dlopen" mysql.la collectd_DEPENDENCIES += mysql.la endif -if BUILD_MODULE_NETWORK +if BUILD_PLUGIN_NETWORK pkglib_LTLIBRARIES += network.la network_la_SOURCES = network.c network.h network_la_LDFLAGS = -module -avoid-version @@ -374,7 +351,7 @@ collectd_LDADD += "-dlopen" network.la collectd_DEPENDENCIES += network.la endif -if BUILD_MODULE_NFS +if BUILD_PLUGIN_NFS pkglib_LTLIBRARIES += nfs.la nfs_la_SOURCES = nfs.c nfs_la_LDFLAGS = -module -avoid-version @@ -382,7 +359,7 @@ collectd_LDADD += "-dlopen" nfs.la collectd_DEPENDENCIES += nfs.la endif -if BUILD_MODULE_NTPD +if BUILD_PLUGIN_NTPD pkglib_LTLIBRARIES += ntpd.la ntpd_la_SOURCES = ntpd.c ntpd_la_LDFLAGS = -module -avoid-version @@ -393,22 +370,15 @@ collectd_LDADD += "-dlopen" ntpd.la collectd_DEPENDENCIES += ntpd.la endif -if BUILD_MODULE_NUT +if BUILD_PLUGIN_NUT pkglib_LTLIBRARIES += nut.la nut_la_SOURCES = nut.c -nut_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_LIBUPSCLIENT -nut_la_LDFLAGS += -lupsclient -if BUILD_WITH_LIBPTHREAD -nut_la_LDFLAGS += -lpthread -endif -endif +nut_la_LDFLAGS = -module -avoid-version -lupsclient -lpthread collectd_LDADD += "-dlopen" nut.la collectd_DEPENDENCIES += nut.la endif -if BUILD_WITH_LIBPERL -if BUILD_MODULE_PERL +if BUILD_PLUGIN_PERL pkglib_LTLIBRARIES += perl.la perl_la_SOURCES = perl.c perl_la_CFLAGS = $(AM_CFLAGS) \ @@ -419,25 +389,22 @@ perl_la_LDFLAGS = -module -avoid-version \ collectd_LDADD += "-dlopen" perl.la collectd_DEPENDENCIES += perl.la endif -endif -if BUILD_MODULE_PING +if BUILD_PLUGIN_PING pkglib_LTLIBRARIES += ping.la ping_la_SOURCES = ping.c ping_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_LIBOPING if BUILD_WITH_OWN_LIBOPING ping_la_LIBADD = liboping/liboping.la ping_la_DEPENDENCIES = liboping/liboping.la else ping_la_LDFLAGS += -loping endif -endif collectd_LDADD += "-dlopen" ping.la collectd_DEPENDENCIES += ping.la endif -if BUILD_MODULE_PROCESSES +if BUILD_PLUGIN_PROCESSES pkglib_LTLIBRARIES += processes.la processes_la_SOURCES = processes.c processes_la_LDFLAGS = -module -avoid-version @@ -445,7 +412,7 @@ collectd_LDADD += "-dlopen" processes.la collectd_DEPENDENCIES += processes.la endif -if BUILD_WITH_RRDTOOL +if BUILD_PLUGIN_RRDTOOL pkglib_LTLIBRARIES += rrdtool.la rrdtool_la_SOURCES = rrdtool.c rrdtool_la_LDFLAGS = -module -avoid-version -lrrd @@ -453,7 +420,7 @@ collectd_LDADD += "-dlopen" rrdtool.la collectd_DEPENDENCIES += rrdtool.la endif -if BUILD_MODULE_SENSORS +if BUILD_PLUGIN_SENSORS pkglib_LTLIBRARIES += sensors.la sensors_la_SOURCES = sensors.c sensors_la_LDFLAGS = -module -avoid-version @@ -464,7 +431,7 @@ collectd_LDADD += "-dlopen" sensors.la collectd_DEPENDENCIES += sensors.la endif -if BUILD_MODULE_SERIAL +if BUILD_PLUGIN_SERIAL pkglib_LTLIBRARIES += serial.la serial_la_SOURCES = serial.c serial_la_LDFLAGS = -module -avoid-version @@ -472,7 +439,7 @@ collectd_LDADD += "-dlopen" serial.la collectd_DEPENDENCIES += serial.la endif -if BUILD_MODULE_SNMP +if BUILD_PLUGIN_SNMP pkglib_LTLIBRARIES += snmp.la snmp_la_SOURCES = snmp.c snmp_la_LDFLAGS = -module -avoid-version @@ -486,7 +453,7 @@ collectd_LDADD += "-dlopen" snmp.la collectd_DEPENDENCIES += snmp.la endif -if BUILD_MODULE_SWAP +if BUILD_PLUGIN_SWAP pkglib_LTLIBRARIES += swap.la swap_la_SOURCES = swap.c swap_la_LDFLAGS = -module -avoid-version @@ -509,7 +476,7 @@ swap_la_LDFLAGS += -lstatgrab endif endif -if BUILD_MODULE_SYSLOG +if BUILD_PLUGIN_SYSLOG pkglib_LTLIBRARIES += syslog.la syslog_la_SOURCES = syslog.c syslog_la_LDFLAGS = -module -avoid-version @@ -517,21 +484,15 @@ collectd_LDADD += "-dlopen" syslog.la collectd_DEPENDENCIES += syslog.la endif -if BUILD_MODULE_TAPE +if BUILD_PLUGIN_TAPE pkglib_LTLIBRARIES += tape.la tape_la_SOURCES = tape.c -tape_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_LIBKSTAT -tape_la_LDFLAGS += -lkstat -endif -if BUILD_WITH_LIBDEVINFO -tape_la_LDFLAGS += -ldevinfo -endif +tape_la_LDFLAGS = -module -avoid-version -lkstat -ldevinfo collectd_LDADD += "-dlopen" tape.la collectd_DEPENDENCIES += tape.la endif -if BUILD_MODULE_UNIXSOCK +if BUILD_PLUGIN_UNIXSOCK pkglib_LTLIBRARIES += unixsock.la unixsock_la_SOURCES = unixsock.c unixsock_la_CPPFLAGS = -DLOCALSTATEDIR='"${localstatedir}"' @@ -540,7 +501,7 @@ collectd_LDADD += "-dlopen" unixsock.la collectd_DEPENDENCIES += unixsock.la endif -if BUILD_MODULE_USERS +if BUILD_PLUGIN_USERS pkglib_LTLIBRARIES += users.la users_la_SOURCES = users.c users_la_LDFLAGS = -module -avoid-version @@ -548,7 +509,7 @@ collectd_LDADD += "-dlopen" users.la collectd_DEPENDENCIES += users.la endif -if BUILD_MODULE_VSERVER +if BUILD_PLUGIN_VSERVER pkglib_LTLIBRARIES += vserver.la vserver_la_SOURCES = vserver.c vserver_la_LDFLAGS = -module -avoid-version @@ -556,7 +517,7 @@ collectd_LDADD += "-dlopen" vserver.la collectd_DEPENDENCIES += vserver.la endif -if BUILD_MODULE_WIRELESS +if BUILD_PLUGIN_WIRELESS pkglib_LTLIBRARIES += wireless.la wireless_la_SOURCES = wireless.c wireless_la_LDFLAGS = -module -avoid-version @@ -564,15 +525,11 @@ collectd_LDADD += "-dlopen" wireless.la collectd_DEPENDENCIES += wireless.la endif -if BUILD_MODULE_XMMS +if BUILD_PLUGIN_XMMS pkglib_LTLIBRARIES += xmms.la xmms_la_SOURCES = xmms.c -xmms_la_CFLAGS = -xmms_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_LIBXMMS -xmms_la_CFLAGS += $(BUILD_WITH_LIBXMMS_CFLAGS) -xmms_la_LDFLAGS += $(BUILD_WITH_LIBXMMS_LIBS) -endif +xmms_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBXMMS_CFLAGS) +xmms_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBXMMS_LIBS) collectd_LDADD += "-dlopen" xmms.la collectd_DEPENDENCIES += xmms.la endif -- 2.30.2