Merged changes from revision 314 (branches/collectd-configfile) to trunk

diff --cc src/Makefile.am
index ae7df9b,1d246a9..c15e91e
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -9,11 -11,12 +9,11 @@@ collectd_SOURCES = collectd.c collectd.
                   utils_mount.c utils_mount.h \
                   common.c common.h \
                   multicast.c multicast.h \
 -                 plugin.c plugin.h \
 -                 configfile.c configfile.h
 +                 plugin.c plugin.h
  #collectd_CFLAGS = -DPLUGINDIR='"$(pkglibdir)"'
  collectd_CPPFLAGS =
- collectd_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"'
- collectd_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/${PACKAGE_NAME}"'
+ collectd_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
+ collectd_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
  collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
  collectd_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
  collectd_LDFLAGS = -export-dynamic

diff --cc src/collectd.c
index 9932fd9,8e92bfb..5e28918
--- 1/src/collectd.c
--- 2/src/collectd.c
+++ b/src/collectd.c
@@@ -242,10 -243,10 +242,10 @@@ int main (int argc, char **argv
        pid_t pid;
  #endif
  
-       char *confdir = SYSCONFDIR;
-       char *pidfile =  PIDFILE;
-       char *plugindir = PLUGINDIR;
-       char *datadir = PKGLOCALSTATEDIR;
 -      char *configfile = CONFIGFILE;
 -      char *pidfile    = PIDFILE;
 -      char *plugindir  = PLUGINDIR;
 -      char *datadir    = PKGLOCALSTATEDIR;
++      char *configfile = CONFIGFILE
++      char *pidfile    = PIDFILE;
++      char *plugindir  = PLUGINDIR;
++      char *datadir    = PKGLOCALSTATEDIR;
  
        int daemonize = 1;