X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.h;h=34b026171efd31307eea8a98e1ded0e93e72c2a0;hb=8feb47511b38bfcc4bdde7cc50e1c2501356b7af;hp=c7aa925ae4d23547d3807c0f1c5f28a7a1554463;hpb=4bc15cc7a6abf216fe76c9802af5eb1f415a389d;p=collectd.git

diff --git a/src/collectd.h b/src/collectd.h
index c7aa925a..34b02617 100644
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -35,8 +35,8 @@
 # include <sys/stat.h>
 #endif
 #if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
+# include <stdlib.h>
+# include <stddef.h>
 #else
 # if HAVE_STDLIB_H
 #  include <stdlib.h>
@@ -95,6 +95,12 @@
 # endif
 #endif
 
+#if HAVE_ASSERT_H
+# include <assert.h>
+#else
+# define assert(...) /* nop */
+#endif
+
 #if HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
@@ -118,55 +124,84 @@
 #if HAVE_CTYPE_H
 # include <ctype.h>
 #endif
-
-#ifndef HAVE_RRD_H
-#undef HAVE_LIBRRD
+#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
 #endif
 
-#ifdef HAVE_LIBRRD
-#include <rrd.h>
-#endif /* HAVE_LIBRRD */
+#if HAVE_SYSLOG
+# define syslog(...) syslog(__VA_ARGS__)
+# if HAVE_OPENLOG
+#  define openlog(...) openlog(__VA_ARGS__)
+# else
+#  define openlog(...) /**/
+# endif
+# if HAVE_CLOSELOG
+#  define closelog(...) closelog(__VA_ARGS__)
+# else
+#  define closelog(...) /**/
+# endif
+#else
+# define syslog(...) /**/
+# define openlog(...) /**/
+# define closelog(...) /**/
+#endif
 
-/* Won't work without the header file */
-#ifndef HAVE_KSTAT_H
-#undef HAVE_LIBKSTAT
+#if HAVE_KSTAT_H
+# include <kstat.h>
 #endif
 
-#ifdef HAVE_LIBKSTAT
-#include <kstat.h>
-#include <sys/param.h>
-#endif /* HAVE_LIBKSTAT */
+#if HAVE_RRD_H
+# include <rrd.h>
+#endif
+#if HAVE_PTH_H
+# include <pth.h>
+#endif
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif
+#if HAVE_SENSORS_SENSORS_H
+# include <sensors/sensors.h>
+#endif
 
-/* Won't work without the header file */
-#ifndef HAVE_STATGRAB_H
-#undef HAVE_LIBSTATGRAB
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME "collectd"
 #endif
 
-#ifdef HAVE_LIBSTATGRAB
-#include <statgrab.h>
+#ifndef PREFIX
+#define PREFIX "/opt/" PACKAGE_NAME
 #endif
 
-#ifndef LOCALSTATEDIR
-#define LOCALSTATEDIR "/opt/collectd/var"
+#ifndef SYSCONFDIR
+#define SYSCONFDIR PREFIX "/etc"
 #endif
 
-#ifndef DATADIR
-#define DATADIR LOCALSTATEDIR"/lib/collectd"
+#ifndef CONFIGFILE
+#define CONFIGFILE SYSCONFDIR"/collectd.conf"
 #endif
 
-#ifndef PLUGINDIR
-#define PLUGINDIR "/opt/collectd/lib/collectd"
+#ifndef PKGLOCALSTATEDIR
+#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
 #endif
 
 #ifndef PIDFILE
-#define PIDFILE LOCALSTATEDIR"/run/collectd.pid"
+#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
+#endif
+
+#ifndef LOGFILE
+#define LOGFILE PREFIX"/var/log/"PACKAGE_NAME"/"PACKAGE_NAME".log"
+#endif
+
+#ifndef PLUGINDIR
+#define PLUGINDIR PREFIX "/lib/" PACKAGE_NAME
 #endif
 
 #define MODE_SERVER 0x01
 #define MODE_CLIENT 0x02
-#define MODE_LOCAL  0x03
+#define MODE_LOCAL  0x04
 
 extern time_t curtime;
 extern int operating_mode;
 
+/* int main (int argc, char **argv); */
+
 #endif /* COLLECTD_H */