summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-12-18 14:31:05 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-12-18 14:31:05 +0000
commitf3eefa2854823a0e4e526b68ffefac2066f32491 (patch)
treec1060e501453f68f40fcfe3960dcd74a4b903e12
parent779558133b0cfd348976dec1a01484496b469b6a (diff)
downloadrsyslog-f3eefa2854823a0e4e526b68ffefac2066f32491.tar.gz
rsyslog-f3eefa2854823a0e4e526b68ffefac2066f32491.tar.xz
rsyslog-f3eefa2854823a0e4e526b68ffefac2066f32491.zip
code cleanups thanks to Michael Biebl
-rw-r--r--configure.ac4
-rw-r--r--omfwd.c3
-rw-r--r--plugins/ommysql/.cvsignore4
-rw-r--r--syslogd.c1
-rw-r--r--syslogd.h2
5 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 173d4e8a..d057318e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.61)
AC_INIT([rsyslog],[2.0.0],[rsyslog@lists.adiscon.com.])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([syslogd.c])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
# Checks for programs.
AC_PROG_CC
@@ -145,7 +145,7 @@ AC_ARG_ENABLE(gssapi_krb5,
if test $want_gssapi_krb5 = yes; then
AC_CHECK_LIB(gssapi_krb5, gss_acquire_cred, [
AC_CHECK_HEADER(gssapi/gssapi.h, [
- AC_MSG_ERROR(GSS-API not ready for primt time yet -- wait for next release);
+ AC_MSG_ERROR(GSS-API not ready for prime time yet -- wait for next release);
AC_DEFINE(USE_GSSAPI,,
Define if you want to use GSSAPI)
gss_libs="-lgssapi_krb5"
diff --git a/omfwd.c b/omfwd.c
index fe866327..e310e6fc 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -43,6 +43,9 @@
#include <errno.h>
#include <ctype.h>
#include <unistd.h>
+#ifdef USE_NETZIP
+#include <zlib.h>
+#endif
#ifdef USE_PTHREADS
#include <pthread.h>
#else
diff --git a/plugins/ommysql/.cvsignore b/plugins/ommysql/.cvsignore
index 1281f785..9730646f 100644
--- a/plugins/ommysql/.cvsignore
+++ b/plugins/ommysql/.cvsignore
@@ -2,5 +2,5 @@
.libs
Makefile
Makefile.in
-ommysql.la
-ommysql_la-ommysql.lo
+*.la
+*.lo
diff --git a/syslogd.c b/syslogd.c
index 483fd415..0ed4065c 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -197,7 +197,6 @@
#endif
#ifdef USE_NETZIP
-#include <unistd.h>
#include <zlib.h>
#endif
diff --git a/syslogd.h b/syslogd.h
index 43d4f0ea..c1d765eb 100644
--- a/syslogd.h
+++ b/syslogd.h
@@ -24,6 +24,8 @@
#include "objomsr.h"
#ifdef USE_NETZIP
+#include <unistd.h>
+#include <zlib.h>
/* config param: minimum message size to try compression. The smaller
* the message, the less likely is any compression gain. We check for
* gain before we submit the message. But to do so we still need to