From f786054cdc128f69fcf5deea191c01de77bd1342 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 10 Apr 2008 09:56:19 +0200 Subject: Add ENABLE_IMKLOG_LINUX Signed-off-by: Rainer Gerhards --- configure.ac | 8 +++++--- plugins/imklog/Makefile.am | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 5d7c46e6..2ca1e075 100644 --- a/configure.ac +++ b/configure.ac @@ -21,11 +21,11 @@ AC_CANONICAL_HOST case "${host}" in *-*-linux*) - AM_CONDITIONAL(ENABLE_IMKLOG_BSD, test x = y) + os_type="linux" ;; *-*-*darwin*|*-*-freebsd*|*-*-netbsd*|*-*-openbsd*) AC_DEFINE([OS_BSD], [1], [Indicator for a BSD OS]) - AM_CONDITIONAL(ENABLE_IMKLOG_BSD, test x = x) + os_type="bsd" ;; esac @@ -205,6 +205,8 @@ AC_ARG_ENABLE(klog, [enable_klog="yes"] ) AM_CONDITIONAL(ENABLE_IMKLOG, test x$enable_klog = xyes) +AM_CONDITIONAL(ENABLE_IMKLOG_BSD, test x$os_type = xbsd) +AM_CONDITIONAL(ENABLE_IMKLOG_LINUX, test x$os_type = xlinux) # # SYSLOG_UNIXAF @@ -621,7 +623,7 @@ echo "****************************************************" echo "rsyslog will be compiled with the following settings:" echo echo "Multithreading support enabled: $enable_pthreads" -echo "Klog functionality enabled: $enable_klog" +echo "Klog functionality enabled: $enable_klog ($os_type)" echo "Regular expressions support enabled: $enable_regexp" echo "Zlib compression support enabled: $enable_zlib" echo "MySql support enabled: $enable_mysql" diff --git a/plugins/imklog/Makefile.am b/plugins/imklog/Makefile.am index 511cd9be..f4cd771b 100644 --- a/plugins/imklog/Makefile.am +++ b/plugins/imklog/Makefile.am @@ -5,8 +5,9 @@ imklog_la_SOURCES = imklog.c imklog.h # select klog "driver" if ENABLE_IMKLOG_BSD imklog_la_SOURCES += bsd.c -else -# we assume this now is Linux (yes, some help with the build system is appreciated ;)) +endif + +if ENABLE_IMKLOG_LINUX imklog_la_SOURCES += linux.c module.h ksym.c ksyms.h ksym_mod.c endif -- cgit