[netfilter-cvslog] r6609 - branches/ulog/ulogd2/src

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2006-05-23 10:41:28 +0200 (Tue, 23 May 2006)
New Revision: 6609

Modified:
   branches/ulog/ulogd2/src/Makefile.am
   branches/ulog/ulogd2/src/ulogd.c
Log:
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)


Modified: branches/ulog/ulogd2/src/Makefile.am
===================================================================
--- branches/ulog/ulogd2/src/Makefile.am	2006-05-23 08:40:06 UTC (rev 6608)
+++ branches/ulog/ulogd2/src/Makefile.am	2006-05-23 08:41:28 UTC (rev 6609)
@@ -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
 

Modified: branches/ulog/ulogd2/src/ulogd.c
===================================================================
--- branches/ulog/ulogd2/src/ulogd.c	2006-05-23 08:40:06 UTC (rev 6608)
+++ branches/ulog/ulogd2/src/ulogd.c	2006-05-23 08:41:28 UTC (rev 6609)
@@ -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 at netfilter.org>\n"