From 4ae1f8a765772d21446ad7f8158fd9d882d06c40 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 12 Oct 2005 15:34:33 +0000
Subject: fixed some make issues when compiling without rfc 3195 support

---
 freebsd/Makefile | 12 ++++++++++++
 linux/Makefile   | 12 ++++++++++++
 master.make      |  6 ------
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/freebsd/Makefile b/freebsd/Makefile
index 27b2dac7..bd099f56 100644
--- a/freebsd/Makefile
+++ b/freebsd/Makefile
@@ -34,6 +34,15 @@ FEATURE_RFC3195=0
 # Enable debug mode (much slower code)
 FEATURE_DEBUG=0
 
+# The following defines tell us where liblogging is located. This
+# is only needed if we build with RFC 3195 support. By default, 
+# liblogging is expected to be present in the our parent directory.
+#
+# THESE PATHES MUST ONLY BE SET IF RSYSLOG IS BUILD WITH
+# RFC 3195 SUPPORT!
+LIBLOGGING_INC=-I../../liblogging/src
+LIBLOGGING_BIN=../../liblogging/src/linux/liblogging.a
+
 #############################################################
 #                  END OF USER SETTINGS                     #
 #                  --------------------                     #
@@ -60,6 +69,9 @@ MANDIR = /usr/share/man
 
 .if $(FEATURE_RFC3195) == 1
   F_RFC3195=-DFEATURE_RFC3195
+.else
+  LIBLOGGING_INC=
+  LIBLOGGING_BIN=
 .endif
 
 .if $(FEATURE_DEBUG) == 0
diff --git a/linux/Makefile b/linux/Makefile
index 7b8da0a8..a7765232 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -36,6 +36,15 @@ FEATURE_RFC3195=0
 # Enable debug mode (much slower code)
 FEATURE_DEBUG=0
 
+# The following defines tell us where liblogging is located. This
+# is only needed if we build with RFC 3195 support. By default, 
+# liblogging is expected to be present in the our parent directory.
+#
+# THESE PATHES MUST ONLY BE SET IF RSYSLOG IS BUILD WITH
+# RFC 3195 SUPPORT!
+LIBLOGGING_INC=-I../../liblogging/src
+LIBLOGGING_BIN=../../liblogging/src/linux/liblogging.a
+
 #############################################################
 #                  END OF USER SETTINGS                     #
 #                  --------------------                     #
@@ -61,6 +70,9 @@ endif
 
 ifeq ($(strip $(FEATURE_RFC3195)), 1)
   F_RFC3195=-DFEATURE_RFC3195
+else
+  LIBLOGGING_INC=
+  LIBLOGGING_BIN=
 endif
 
 ifeq ($(strip $(FEATURE_DEBUG)), 0)
diff --git a/master.make b/master.make
index 47a66172..9deab46b 100644
--- a/master.make
+++ b/master.make
@@ -23,12 +23,6 @@ LDFLAGS= -s
 # file system standard.
 FSSTND = -DFSSTND
 
-# The following defines tell us where liblogging is located. This
-# is only needed if we build with RFC 3195 support. By default, 
-# liblogging is expected to be present in the our parent directory.
-LIBLOGGING_INC=-I../../liblogging/src
-LIBLOGGING_BIN=../../liblogging/src/linux/liblogging.a
-
 # The following define establishes the name of the pid file for the
 # rsyslogd daemon.  The library include file (paths.h) defines the
 # name for the rsyslogd pid to be rsyslog.pid.
-- 
cgit