summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-01-30 07:30:20 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-01-30 07:30:20 +0000
commit7f3886e54be0f3b7f8c4912c192a6fa4f74cadf7 (patch)
tree4f1dd9d7882a4d6cb1d3bc44d833ddfa59b6c767
parent1580c701aedeadaa2c864f81b96bb38fc5461b31 (diff)
downloadrsyslog-7f3886e54be0f3b7f8c4912c192a6fa4f74cadf7.tar.gz
rsyslog-7f3886e54be0f3b7f8c4912c192a6fa4f74cadf7.tar.xz
rsyslog-7f3886e54be0f3b7f8c4912c192a6fa4f74cadf7.zip
fixed a makefile bug that disabled db suppot when netzip was enabled
-rw-r--r--NEWS2
-rw-r--r--freebsd/Makefile9
-rw-r--r--linux/Makefile2
-rw-r--r--master.make4
4 files changed, 14 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index f6dc7e6e..144bd0a3 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Version 1.13.1 (RGer), 2007-02-xx
the maximum number of TCP connections configurd (10% + 5) - thanks to Guy
Standen for the hint (actually, the limit was 5 and that was a
left-over from early testing).
+- fixed a bug in makefile which caused DB-support to be disabled when
+ NETZIP support was enabled
---------------------------------------------------------------------------
Version 1.13.0 (RGer), 2006-12-19
- added '$' as ToPos proptery replacer specifier - means "up to the
diff --git a/freebsd/Makefile b/freebsd/Makefile
index 0dd25f95..7b05766f 100644
--- a/freebsd/Makefile
+++ b/freebsd/Makefile
@@ -34,6 +34,11 @@ FEATURE_RFC3195=0
# Enable multithreading via pthreads (experimental!)
FEATURE_PTHREADS=1
+# Enable zlib compression
+# Depending on the messages, turning zlib compression on
+# results in moderate savings of network traffic.
+FEATURE_NETZIP=1
+
# Enable debug mode (much slower code)
FEATURE_DEBUG=0
@@ -66,6 +71,10 @@ MANDIR = /usr/share/man
WITHDB=-DWITH_DB
.endif
+.if $(FEATURE_NETZIP) == 1
+ NETZIP=-DWITH_DB
+.endif
+
.if $(FEATURE_REGEXP) == 1
F_REGEXP=-DFEATURE_REGEXP
.endif
diff --git a/linux/Makefile b/linux/Makefile
index 7ed8c14d..c8321a75 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -77,7 +77,7 @@ ifeq ($(strip $(FEATURE_REGEXP)), 1)
endif
ifeq ($(strip $(FEATURE_NETZIP)), 1)
- WITHDB=-DUSE_NETZIP
+ NETZIP=-DUSE_NETZIP
LZ=-lz
endif
diff --git a/master.make b/master.make
index 7e8045d8..ca35481a 100644
--- a/master.make
+++ b/master.make
@@ -33,7 +33,7 @@ SYSLOGD_FLAGS= -DSYSLOG_INET -DSYSLOG_UNIXAF ${FSSTND} \
SYSLOG_FLAGS= -DALLOW_KERNEL_LOGGING
.c.o:
- ${CC} ${CFLAGS} ${LIBLOGGING_INC} -c $(VPATH)$*.c
+ ${CC} ${CFLAGS} ${NETZIP} ${LIBLOGGING_INC} -c $(VPATH)$*.c
all: rfc3195d syslogd
@@ -55,7 +55,7 @@ outchannel.o: outchannel.c outchannel.h stringbuf.h syslogd.h rsyslog.h
rfc3195d.o: rfc3195d.c rsyslog.h
syslogd.o: syslogd.c version.h parse.h template.h stringbuf.h outchannel.h syslogd.h rsyslog.h
- ${CC} ${CFLAGS} ${SYSLOGD_FLAGS} -c $(VPATH)syslogd.c
+ ${CC} ${CFLAGS} ${NETZIP} ${SYSLOGD_FLAGS} -c $(VPATH)syslogd.c
syslog.o: syslog.c
${CC} ${CFLAGS} ${SYSLOG_FLAGS} -c $(VPATH)syslog.c