move definition of ULOGD_LOGFILE_DEFAULT and ULOGD_CONFIGFILE to Makefile.am,

Set default config and log files based on configure.
Note that these defines cannot be placed in config.h, since they
depend on the prefix, which must be expanded by make. (Philip Craig)

diff --git a/src/Makefile.am b/src/Makefile.am
index 783f153a24005c0734c68fde3203590349b4c01a..8093aef7c612e032296f89b2aa9f0105e26b84a1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,7 @@
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include \
+             -DULOGD_CONFIGFILE="\"$(sysconfdir)/ulogd.conf\"" \
+             -DULOGD_LOGFILE_DEFAULT="\"$(localstatedir)/log/ulogd.log\""
 
 sbin_PROGRAMS = ulogd
 

diff --git a/src/ulogd.c b/src/ulogd.c
index b408fe9eaf5c2a3924d6d096a73527c9f37e8e3d..2dc597bc569cf3f37ae90b9dbf708e2f65be74b9 100644 (file)
--- a/src/ulogd.c
+++ b/src/ulogd.c
@@ -69,16 +69,6 @@
 #define DEBUGP(format, args...) 
 #endif
 
-/* default config parameters, if not changed in configfile */
-#ifndef ULOGD_LOGFILE_DEFAULT
-#define ULOGD_LOGFILE_DEFAULT  "/var/log/ulogd.log"
-#endif
-
-/* where to look for the config file */
-#ifndef ULOGD_CONFIGFILE
-#define ULOGD_CONFIGFILE       "/usr/local/etc/ulogd.conf"
-#endif
-
 #define COPYRIGHT \
        "Copyright (C) 2000-2005 Harald Welte <laforge@netfilter.org>\n"