From 4501b6c4e1efd31d7e275320ff693d5f22d70e62 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 18 Dec 2007 14:44:39 +0000
Subject: code cleanups thanks to Michael Biebl

---
 .cvsignore                 | 2 ++
 configure.ac               | 4 ++--
 omfwd.c                    | 3 +++
 plugins/imklog/.cvsignore  | 4 ++--
 plugins/immark/.cvsignore  | 4 ++--
 plugins/ommysql/.cvsignore | 4 ++--
 syslogd.c                  | 1 -
 syslogd.h                  | 2 ++
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 405dee34..cbc6b377 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,8 @@
 .tar.gz
 .deps
 .libs
+*.lo
+*.la
 Makefile
 Makefile.in
 autom4te.cache
diff --git a/configure.ac b/configure.ac
index 2cf912ec..545e0594 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.61)
 AC_INIT([rsyslog],[3.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 13e82077..c6a60791 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -44,6 +44,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/imklog/.cvsignore b/plugins/imklog/.cvsignore
index f43c5593..9730646f 100644
--- a/plugins/imklog/.cvsignore
+++ b/plugins/imklog/.cvsignore
@@ -2,5 +2,5 @@
 .libs
 Makefile
 Makefile.in
-imklog.la
-immklog-ommysql.lo
+*.la
+*.lo
diff --git a/plugins/immark/.cvsignore b/plugins/immark/.cvsignore
index d2a72d33..9730646f 100644
--- a/plugins/immark/.cvsignore
+++ b/plugins/immark/.cvsignore
@@ -2,5 +2,5 @@
 .libs
 Makefile
 Makefile.in
-immark.la
-immark_la-ommysql.lo
+*.la
+*.lo
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 753ed56f..5426df75 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -204,7 +204,6 @@
 #endif
 
 #ifdef USE_NETZIP
-#include <unistd.h>
 #include <zlib.h>
 #endif
 
diff --git a/syslogd.h b/syslogd.h
index fe58b9b9..b94f6970 100644
--- a/syslogd.h
+++ b/syslogd.h
@@ -26,6 +26,8 @@
 #include "template.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
-- 
cgit