From 1842a7a770593554fd0bac5f407e47f765011eb9 Mon Sep 17 00:00:00 2001 From: octo Date: Sun, 2 Apr 2006 19:48:54 +0000 Subject: [PATCH] Removed all header-files of plugins, since they're not needed. Changed the src/Makefile.am accordingly. Updated the configure.in to check for `stdio.h'. This is needed to load libconfig correctly. --- configure.in | 96 ++++++++++++++++++++++++++++++++++++------------- src/Makefile.am | 28 +++++++-------- src/collectd.c | 2 -- src/cpu.h | 42 ---------------------- src/cpufreq.h | 37 ------------------- src/disk.h | 37 ------------------- src/hddtemp.h | 34 ------------------ src/load.h | 37 ------------------- src/memory.h | 37 ------------------- src/nfs.h | 37 ------------------- src/ping.h | 42 ---------------------- src/processes.h | 38 -------------------- src/sensors.h | 42 ---------------------- src/serial.h | 42 ---------------------- src/swap.h | 37 ------------------- src/tape.h | 37 ------------------- src/traffic.h | 37 ------------------- src/users.h | 29 --------------- 18 files changed, 85 insertions(+), 606 deletions(-) delete mode 100644 src/cpu.h delete mode 100644 src/cpufreq.h delete mode 100644 src/disk.h delete mode 100644 src/hddtemp.h delete mode 100644 src/load.h delete mode 100644 src/memory.h delete mode 100644 src/nfs.h delete mode 100644 src/ping.h delete mode 100644 src/processes.h delete mode 100644 src/sensors.h delete mode 100644 src/serial.h delete mode 100644 src/swap.h delete mode 100644 src/tape.h delete mode 100644 src/traffic.h delete mode 100644 src/users.h diff --git a/configure.in b/configure.in index af5500ef..6ecb81c5 100644 --- a/configure.in +++ b/configure.in @@ -34,6 +34,7 @@ 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) @@ -312,30 +313,6 @@ AC_CHECK_LIB(resolv, res_search, [with_libresolv="no"]) AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes") -with_libcurl="yes" -AC_CHECK_LIB(curl, curl_easy_init, -[ - AC_DEFINE(HAVE_LIBCURL, 1, [Define to 1 if you have the 'curl' library (-lcurl).]) -], -[with_libcurl="no"]) -if test "x$with_libcurl" = "xyes" -then - with_libcurl_libs=`curl-config --libs 2>/dev/null` - curl_config_status=$? - - BUILD_WITH_LIBCURL_LIBS="-lcurl" - if test $curl_config_status -ne 0 - then - with_libcurl="no" - else - if test "x$with_libcurl_libs" != "x" - then - BUILD_WITH_LIBCURL_LIBS="$with_libcurl_libs"; - fi - fi - AC_SUBST(BUILD_WITH_LIBCURL_LIBS) -fi -AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes") m4_divert_once([HELP_WITH], [ collectd additional packages:]) @@ -422,9 +399,78 @@ 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") +### BEGIN of check for libcurl ### +with_curl_config="curl-config" +with_curl_prefix=0 +with_curl_libs="" +AC_ARG_WITH(libcurl, [AS_HELP_STRING([--with-libcurl@<:@=PREFIX@:>@], [Path to libcurl.])], +[ + if test "x$withval" != "xno" -a "x$withval" != "xyes" + then + if test -x "$withval/bin/curl-config" + then + with_curl_config="$withval/bin/curl-config" + with_curl_prefix=1 + fi + fi + if test "x$withval" = "xno" + then + with_libcurl="no" + else + with_libcurl="yes" + fi +], +[ + with_libcurl="yes" +]) +if test "x$with_libcurl" = "xyes" +then + with_curl_libs=`$with_curl_config --libs 2>/dev/null` + curl_config_status=$? + + if test $curl_config_status -ne 0 + then + with_libcurl="no" + else + AC_CHECK_LIB(curl, curl_easy_init, + [ + BUILD_WITH_LIBCURL_LIBS="$with_curl_libs" + AC_SUBST(BUILD_WITH_LIBCURL_LIBS) + ], + [ + with_libcurl="no" + ], + [$with_curl_libs]) + fi +fi +if test "x$with_libcurl" = "xyes" -a $with_curl_prefix -ne 0 +then + with_curl_prefix=`$with_curl_config --libs 2>/dev/null` + curl_config_status=$? + + if test $curl_config_status -ne 0 + then + with_libcurl="no" + else + if test -d "$with_curl_prefix/include" + then + CPPFLAGS="$CPPFLAGS -I$with_curl_prefix/include" + fi + fi +fi + +with_libcurl_numeric=0 +if test "x$with_libcurl" = "xyes" +then + with_libcurl_numeric=1 +fi +AC_DEFINE_UNQUOTED(HAVE_LIBCURL, [$with_libcurl_numeric], [Define to 1 if you have the 'curl' library (-lcurl).]) +AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes") +### END of check for libcurl ### + AC_ARG_WITH(libstatgrab, [AS_HELP_STRING([--with-libstatgrab@<:@=PREFIX@:>@], [Path to libstatgrab.])], [ - if test "x$withval" != "xno" && test "x$withval" != "xyes" + if test "x$withval" != "xno" -a "x$withval" != "xyes" then LDFLAGS="$LDFLAGS -L$withval/lib" CPPFLAGS="$CPPFLAGS -I$withval/include" diff --git a/src/Makefile.am b/src/Makefile.am index 765cb106..cff1ceb9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,7 +73,7 @@ endif if BUILD_MODULE_CPUFREQ pkglib_LTLIBRARIES += cpufreq.la -cpufreq_la_SOURCES = cpufreq.c cpufreq.h +cpufreq_la_SOURCES = cpufreq.c cpufreq_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" cpufreq.la collectd_DEPENDENCIES += cpufreq.la @@ -89,7 +89,7 @@ endif if BUILD_MODULE_DISK pkglib_LTLIBRARIES += disk.la -disk_la_SOURCES = disk.c disk.h +disk_la_SOURCES = disk.c disk_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" disk.la collectd_DEPENDENCIES += disk.la @@ -108,7 +108,7 @@ endif if BUILD_MODULE_HDDTEMP pkglib_LTLIBRARIES += hddtemp.la -hddtemp_la_SOURCES = hddtemp.c hddtemp.h +hddtemp_la_SOURCES = hddtemp.c hddtemp_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" hddtemp.la collectd_DEPENDENCIES += hddtemp.la @@ -116,7 +116,7 @@ endif if BUILD_MODULE_LOAD pkglib_LTLIBRARIES += load.la -load_la_SOURCES = load.c load.h +load_la_SOURCES = load.c load_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" load.la collectd_DEPENDENCIES += load.la @@ -124,7 +124,7 @@ endif if BUILD_MODULE_MEMORY pkglib_LTLIBRARIES += memory.la -memory_la_SOURCES = memory.c memory.h +memory_la_SOURCES = memory.c memory_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" memory.la collectd_DEPENDENCIES += memory.la @@ -143,7 +143,7 @@ endif if BUILD_MODULE_NFS pkglib_LTLIBRARIES += nfs.la -nfs_la_SOURCES = nfs.c nfs.h +nfs_la_SOURCES = nfs.c nfs_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" nfs.la collectd_DEPENDENCIES += nfs.la @@ -151,7 +151,7 @@ endif if BUILD_MODULE_PING pkglib_LTLIBRARIES += ping.la -ping_la_SOURCES = ping.c ping.h +ping_la_SOURCES = ping.c ping_la_LDFLAGS = -module -avoid-version ping_la_LIBADD = liboping/liboping.la ping_la_DEPENDENCIES = liboping/liboping.la @@ -161,7 +161,7 @@ endif if BUILD_MODULE_PROCESSES pkglib_LTLIBRARIES += processes.la -processes_la_SOURCES = processes.c processes.h +processes_la_SOURCES = processes.c processes_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" processes.la collectd_DEPENDENCIES += processes.la @@ -169,7 +169,7 @@ endif if BUILD_MODULE_SENSORS pkglib_LTLIBRARIES += sensors.la -sensors_la_SOURCES = sensors.c sensors.h +sensors_la_SOURCES = sensors.c sensors_la_LDFLAGS = -module -avoid-version if BUILD_WITH_LM_SENSORS sensors_la_LDFLAGS += -lsensors @@ -180,7 +180,7 @@ endif if BUILD_MODULE_SERIAL pkglib_LTLIBRARIES += serial.la -serial_la_SOURCES = serial.c serial.h +serial_la_SOURCES = serial.c serial_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" serial.la collectd_DEPENDENCIES += serial.la @@ -188,7 +188,7 @@ endif if BUILD_MODULE_SWAP pkglib_LTLIBRARIES += swap.la -swap_la_SOURCES = swap.c swap.h +swap_la_SOURCES = swap.c swap_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" swap.la collectd_DEPENDENCIES += swap.la @@ -196,7 +196,7 @@ endif if BUILD_MODULE_TAPE pkglib_LTLIBRARIES += tape.la -tape_la_SOURCES = tape.c tape.h +tape_la_SOURCES = tape.c tape_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" tape.la collectd_DEPENDENCIES += tape.la @@ -204,7 +204,7 @@ endif if BUILD_MODULE_TRAFFIC pkglib_LTLIBRARIES += traffic.la -traffic_la_SOURCES = traffic.c traffic.h +traffic_la_SOURCES = traffic.c traffic_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" traffic.la collectd_DEPENDENCIES += traffic.la @@ -212,7 +212,7 @@ endif if BUILD_MODULE_USERS pkglib_LTLIBRARIES += users.la -users_la_SOURCES = users.c users.h +users_la_SOURCES = users.c users_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" users.la collectd_DEPENDENCIES += users.la diff --git a/src/collectd.c b/src/collectd.c index 5a17124e..138493dc 100644 --- a/src/collectd.c +++ b/src/collectd.c @@ -29,8 +29,6 @@ #include "plugin.h" #include "configfile.h" -#include "ping.h" - static int loop = 0; #if HAVE_LIBKSTAT diff --git a/src/cpu.h b/src/cpu.h deleted file mode 100644 index fa5a7101..00000000 --- a/src/cpu.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * collectd - src/cpu.h - * Copyright (C) 2005 Florian octo Forster - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Florian octo Forster - **/ - -#ifndef CPU_H -#define CPU_H - -#include "collectd.h" - -#ifndef COLLECT_CPU -#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) || defined(HAVE_SYSCTLBYNAME) -#define COLLECT_CPU 1 -#else -#define COLLECT_CPU 0 -#endif -#endif /* !defined(COLLECT_CPU) */ - -#if COLLECT_CPU - -void cpu_init (void); -void cpu_read (void); - -#endif /* COLLECT_CPU */ -#endif /* CPU_H */ diff --git a/src/cpufreq.h b/src/cpufreq.h deleted file mode 100644 index 9c0d41e3..00000000 --- a/src/cpufreq.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * collectd - src/cpufreq.c - * Copyright (C) 2005 Peter Holik - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Peter Holik - **/ - -#ifndef CPUFREQ_H -#define CPUFREQ_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_CPUFREQ -#if defined(KERNEL_LINUX) -#define COLLECT_CPUFREQ 1 -#else -#define COLLECT_CPUFREQ 0 -#endif -#endif /* !defined(COLLECT_CPUFREQ) */ - -#endif /* CPUFREQ_H */ diff --git a/src/disk.h b/src/disk.h deleted file mode 100644 index f9469638..00000000 --- a/src/disk.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * collectd - src/disk.h - * Copyright (C) 2005 Florian octo Forster - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Florian octo Forster - **/ - -#ifndef DISKSTATS_H -#define DISKSTATS_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_DISK -#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) -#define COLLECT_DISK 1 -#else -#define COLLECT_DISK 0 -#endif -#endif /* !defined(COLLECT_DISK) */ - -#endif /* DISKSTATS_H */ diff --git a/src/hddtemp.h b/src/hddtemp.h deleted file mode 100644 index aaf01915..00000000 --- a/src/hddtemp.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * collectd - src/hddtemp.c - * Copyright (C) 2005 Vincent Stehlé - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Vincent Stehlé - * Florian octo Forster - **/ - -#ifndef HDDTEMP_H -#define HDDTEMP_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_HDDTEMP -#define COLLECT_HDDTEMP 1 -#endif - -#endif /* HDDTEMP_H */ diff --git a/src/load.h b/src/load.h deleted file mode 100644 index 651d1d6e..00000000 --- a/src/load.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * collectd - src/load.h - * Copyright (C) 2005 Florian octo Forster - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Florian octo Forster - **/ - -#ifndef LOAD_H -#define LOAD_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_LOAD -#if defined(HAVE_GETLOADAVG) || defined(KERNEL_LINUX) || defined(HAVE_LIBSTATGRAB) -#define COLLECT_LOAD 1 -#else -#define COLLECT_LOAD 0 -#endif -#endif /* !defined(COLLECT_LOAD) */ - -#endif /* LOAD_H */ diff --git a/src/memory.h b/src/memory.h deleted file mode 100644 index c4571102..00000000 --- a/src/memory.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * collectd - src/memory.h - * Copyright (C) 2005 Florian octo Forster - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Florian octo Forster - **/ - -#ifndef MEMINFO_H -#define MEMINFO_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_MEMORY -#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) || defined(HAVE_LIBSTATGRAB) -#define COLLECT_MEMORY 1 -#else -#define COLLECT_MEMORY 0 -#endif -#endif /* !defined(COLLECT_MEMORY) */ - -#endif /* MEMINFO_H */ diff --git a/src/nfs.h b/src/nfs.h deleted file mode 100644 index ae752be0..00000000 --- a/src/nfs.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * collectd - src/nfs.h - * Copyright (C) 2005 Jason Pepas - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Jason Pepas - * Florian octo Forster - **/ - -#ifndef NFS_H -#define NFS_H - -#include "collectd.h" - -#ifndef COLLECT_NFS -#if defined(KERNEL_LINUX) -#define COLLECT_NFS 1 -#else -#define COLLECT_NFS 0 -#endif -#endif /* !defined(COLLECT_NFS) */ - -#endif /* NFS_H */ diff --git a/src/ping.h b/src/ping.h deleted file mode 100644 index c5f26c44..00000000 --- a/src/ping.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * collectd - src/ping.h - * Copyright (C) 2005 Florian octo Forster - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Florian octo Forster - **/ - -#ifndef COLLECTD_PING_H -#define COLLECTD_PING_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_PING -#if defined(HAVE_NETINET_IN_H) -#define COLLECT_PING 1 -#else -#define COLLECT_PING 0 -#endif /* defined(HAVE_NETINET_IN_H) */ -#endif /* !defined(COLLECT_PING) */ - -#if COLLECT_PING - -#define MAX_PINGHOSTS 32 - -#endif /* COLLECT_PING */ -#endif diff --git a/src/processes.h b/src/processes.h deleted file mode 100644 index db8446a0..00000000 --- a/src/processes.h +++ /dev/null @@ -1,38 +0,0 @@ -/** - * collectd - src/processes.h - * Copyright (C) 2005 Lyonel Vincent - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Lyonel Vincent - * Florian octo Forster - **/ - -#ifndef PROCESSES_H -#define PROCESSES_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_PROCESSES -#if defined(KERNEL_LINUX) -#define COLLECT_PROCESSES 1 -#else -#define COLLECT_PROCESSES 0 -#endif -#endif /* !defined(COLLECT_PROCESSES) */ - -#endif /* PROCESSES_H */ diff --git a/src/sensors.h b/src/sensors.h deleted file mode 100644 index 9fb17676..00000000 --- a/src/sensors.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * collectd - src/sensors.h - * Copyright (C) 2005 Florian octo Forster - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Florian octo Forster - **/ - -#ifndef SENSORS_H -#define SENSORS_H - -#include "collectd.h" -#include "common.h" - -/* Won't compile without header file */ -#ifndef HAVE_SENSORS_SENSORS_H -#undef HAVE_LIBSENSORS -#endif - -#ifndef COLLECT_SENSORS -#ifdef HAVE_LIBSENSORS -#define COLLECT_SENSORS 1 -#else -#define COLLECT_SENSORS 0 -#endif -#endif /* !defined(COLLECT_SENSORS) */ - -#endif /* SENSORS_H */ diff --git a/src/serial.h b/src/serial.h deleted file mode 100644 index 83372801..00000000 --- a/src/serial.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * collectd - src/serial.h - * Copyright (C) 2005 David Bacher - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * David Bacher - * Florian octo Forster - **/ - -#ifndef SERIAL_H -#define SERIAL_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_SERIAL -#if defined(KERNEL_LINUX) -#define COLLECT_SERIAL 1 -#else -#define COLLECT_SERIAL 0 -#endif -#endif /* !defined(COLLECT_SERIAL) */ - -#endif /* SERIAL_H */ - - - - diff --git a/src/swap.h b/src/swap.h deleted file mode 100644 index dfe5d36d..00000000 --- a/src/swap.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * collectd - src/swap.h - * Copyright (C) 2005 Florian octo Forster - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Florian octo Forster - **/ - -#ifndef SWAP_H -#define SWAP_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_SWAP -#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) || defined(HAVE_LIBSTATGRAB) -#define COLLECT_SWAP 1 -#else -#define COLLECT_SWAP 0 -#endif -#endif /* !defined(COLLECT_SWAP) */ - -#endif /* SWAP_H */ diff --git a/src/tape.h b/src/tape.h deleted file mode 100644 index acf03a37..00000000 --- a/src/tape.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * collectd - src/tape.h - * Copyright (C) 2005 Scott Garrett - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Scott Garrett - **/ - -#ifndef TAPESTATS_H -#define TAPESTATS_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_TAPE -#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) -#define COLLECT_TAPE 1 -#else -#define COLLECT_TAPE 0 -#endif -#endif /* !defined(COLLECT_TAPE) */ - -#endif /* TAPESTATS_H */ diff --git a/src/traffic.h b/src/traffic.h deleted file mode 100644 index 3b95927a..00000000 --- a/src/traffic.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * collectd - src/traffic.h - * Copyright (C) 2005 Florian octo Forster - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Florian octo Forster - **/ - -#ifndef TRAFFIC_H -#define TRAFFIC_H - -#include "collectd.h" -#include "common.h" - -#ifndef COLLECT_TRAFFIC -#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) || defined(HAVE_LIBSTATGRAB) -#define COLLECT_TRAFFIC 1 -#else -#define COLLECT_TRAFFIC 0 -#endif -#endif /* !defined(COLLECT_TRAFFIC) */ - -#endif /* TRAFFIC_H */ diff --git a/src/users.h b/src/users.h deleted file mode 100644 index c5140941..00000000 --- a/src/users.h +++ /dev/null @@ -1,29 +0,0 @@ -/** - * collectd - src/users.h - * Copyright (C) 2005 Sebastian Harl - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Sebastian Harl - **/ - -#if !COLLECTD_USERS_H -#define COLLECTD_USERS_H 1 - -void module_register(void); - -#endif /* !COLLECTD_USERS_H */ - -- 2.30.2