From 28dcc746bd463541a48bad64a37039658f1aa3f7 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 6 Mar 2008 07:39:32 +0000
Subject: applied patch from Michael Biebl to clean up build system

---
 Makefile.am                    | 12 ++++++------
 configure.ac                   | 14 +++++---------
 plugins/imfile/Makefile.am     |  4 ++--
 plugins/imgssapi/Makefile.am   |  4 ++--
 plugins/imklog/Makefile.am     |  4 ++--
 plugins/immark/Makefile.am     |  4 ++--
 plugins/imtcp/Makefile.am      |  5 +++--
 plugins/imtemplate/Makefile.am |  4 ++--
 plugins/imudp/Makefile.am      |  4 ++--
 plugins/imuxsock/Makefile.am   |  4 ++--
 plugins/omgssapi/Makefile.am   |  4 ++--
 plugins/omlibdbi/Makefile.am   |  4 ++--
 plugins/ommysql/Makefile.am    |  4 ++--
 plugins/ompgsql/Makefile.am    |  2 +-
 plugins/omsnmp/Makefile.am     |  4 ++--
 plugins/omtesting/Makefile.am  |  4 ++--
 16 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fcf8190f..3e5a2c7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,8 +91,8 @@ rsyslogd_SOURCES = \
 	action.c \
 	action.h
 
-rsyslogd_CPPFLAGS =  $(mudflap_cflags) -D_PATH_MODDIR=\"$(pkglibdir)/\" $(pthreads_cflags)
-rsyslogd_LDADD = $(mudflap_libs) $(zlib_libs) $(pthreads_libs) $(dl_libs) $(rt_libs)
+rsyslogd_CPPFLAGS =  -D_PATH_MODDIR=\"$(pkglibdir)/\" $(pthreads_cflags)
+rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(dl_libs) $(rt_libs)
 rsyslogd_LDFLAGS = -export-dynamic
 
 # now come the library plugins
@@ -106,8 +106,8 @@ tcpsrv_la_SOURCES = \
 	tcps_sess.h \
 	tcpsrv.c \
 	tcpsrv.h
-tcpsrv_la_CPPFLAGS = $(pthreads_cflags) $(mudflap_cflags)
-tcpsrv_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+tcpsrv_la_CPPFLAGS = $(pthreads_cflags)
+tcpsrv_la_LDFLAGS = -module -avoid-version
 tcpsrv_la_LIBADD = 
 
 #
@@ -116,8 +116,8 @@ tcpsrv_la_LIBADD =
 if ENABLE_GSSAPI
 pkglib_LTLIBRARIES += gssutil.la
 gssutil_la_SOURCES = gss-misc.c gss-misc.h
-gssutil_la_CPPFLAGS = $(pthreads_cflags) $(mudflap_cflags)
-gssutil_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+gssutil_la_CPPFLAGS = $(pthreads_cflags)
+gssutil_la_LDFLAGS = -module -avoid-version
 gssutil_la_LIBADD = 
 endif
 
diff --git a/configure.ac b/configure.ac
index 76120db5..bbb0ff44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rsyslog],[3.12.1],[rsyslog@lists.adiscon.com.])
+AC_INIT([rsyslog],[3.12.1],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([syslogd.c])
 AC_CONFIG_HEADERS([config.h])
@@ -296,13 +296,9 @@ AC_ARG_ENABLE(mudflap,
         [enable_mudflap="no"]
 )
 if test "$enable_mudflap" = "yes"; then
-	  # is there any way to just change the -O option in default CFLAGS? -- rgerhards, 2008-01-08
-	  CFLAGS="-O1 -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -g"
-          mudflap_libs="-lmudflapth"
-          mudflap_cflags="-fmudflapth"
-          AC_SUBST(mudflap_libs)
-          AC_SUBST(mudflap_cflags)
-        ],
+        # is there any way to just change the -O option in default CFLAGS? -- rgerhards, 2008-01-08
+        CFLAGS="-fmudflapth $CFLAGS"
+        LIBS="-lmudflapth $LIBS"
 fi
 
 
@@ -368,7 +364,7 @@ if test "x$enable_pgsql" = "xyes"; then
     [pq],
     [PQconnectdb],
     [pgsql_cflags="-I`pg_config --includedir`"
-     pgsql_libs="`pg_config --libdir` -lpq"
+     pgsql_libs="-L`pg_config --libdir` -lpq"
     ],
     [AC_MSG_FAILURE([PgSQL library is missing])],
     [-L`pg_config --libdir`]
diff --git a/plugins/imfile/Makefile.am b/plugins/imfile/Makefile.am
index ea3c8ec3..23b64d1b 100644
--- a/plugins/imfile/Makefile.am
+++ b/plugins/imfile/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = imfile.la
 
 imfile_la_SOURCES = imfile.c
-imfile_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-imfile_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+imfile_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+imfile_la_LDFLAGS = -module -avoid-version
 imfile_la_LIBADD = 
diff --git a/plugins/imgssapi/Makefile.am b/plugins/imgssapi/Makefile.am
index 33f2d32d..42a243f4 100644
--- a/plugins/imgssapi/Makefile.am
+++ b/plugins/imgssapi/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = imgssapi.la
 
 imgssapi_la_SOURCES = imgssapi.c
-imgssapi_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-imgssapi_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+imgssapi_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+imgssapi_la_LDFLAGS = -module -avoid-version
 imgssapi_la_LIBADD = $(gss_libs)
diff --git a/plugins/imklog/Makefile.am b/plugins/imklog/Makefile.am
index 8d435dfc..11e00962 100644
--- a/plugins/imklog/Makefile.am
+++ b/plugins/imklog/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = imklog.la
 
 imklog_la_SOURCES = imklog.c imklog.h module.h ksym.c ksyms.h ksym_mod.c
-imklog_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-imklog_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+imklog_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+imklog_la_LDFLAGS = -module -avoid-version
 imklog_la_LIBADD = 
diff --git a/plugins/immark/Makefile.am b/plugins/immark/Makefile.am
index 157ec077..3dc0e408 100644
--- a/plugins/immark/Makefile.am
+++ b/plugins/immark/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = immark.la
 
 immark_la_SOURCES = immark.c immark.h
-immark_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-immark_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+immark_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+immark_la_LDFLAGS = -module -avoid-version
 immark_la_LIBADD = 
diff --git a/plugins/imtcp/Makefile.am b/plugins/imtcp/Makefile.am
index 6298135a..ad5135ba 100644
--- a/plugins/imtcp/Makefile.am
+++ b/plugins/imtcp/Makefile.am
@@ -1,5 +1,6 @@
 pkglib_LTLIBRARIES = imtcp.la
 
 imtcp_la_SOURCES = imtcp.c
-imtcp_la_CPPFLAGS = -DFORCE_NO_GSS=1 -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-imtcp_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+imtcp_la_CPPFLAGS = -DFORCE_NO_GSS=1 -I$(top_srcdir) $(pthreads_cflags)
+imtcp_la_LDFLAGS = -module -avoid-version
+imtcp_la_LIBADD = 
diff --git a/plugins/imtemplate/Makefile.am b/plugins/imtemplate/Makefile.am
index 46a2267e..a9221817 100644
--- a/plugins/imtemplate/Makefile.am
+++ b/plugins/imtemplate/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = imtemplate.la
 
 imtemplate_la_SOURCES = imtemplate.c
-imtemplate_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-imtemplate_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+imtemplate_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+imtemplate_la_LDFLAGS = -module -avoid-version
 imtemplate_la_LIBADD = 
diff --git a/plugins/imudp/Makefile.am b/plugins/imudp/Makefile.am
index a1f5a210..53fdad16 100644
--- a/plugins/imudp/Makefile.am
+++ b/plugins/imudp/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = imudp.la
 
 imudp_la_SOURCES = imudp.c
-imudp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-imudp_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+imudp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+imudp_la_LDFLAGS = -module -avoid-version
 imudp_la_LIBADD = 
diff --git a/plugins/imuxsock/Makefile.am b/plugins/imuxsock/Makefile.am
index e1933d99..e165bb7d 100644
--- a/plugins/imuxsock/Makefile.am
+++ b/plugins/imuxsock/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = imuxsock.la
 
 imuxsock_la_SOURCES = imuxsock.c
-imuxsock_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-imuxsock_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+imuxsock_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+imuxsock_la_LDFLAGS = -module -avoid-version
 imuxsock_la_LIBADD = 
diff --git a/plugins/omgssapi/Makefile.am b/plugins/omgssapi/Makefile.am
index 3ec18282..5280a1ce 100644
--- a/plugins/omgssapi/Makefile.am
+++ b/plugins/omgssapi/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = omgssapi.la
 
 omgssapi_la_SOURCES = omgssapi.c
-omgssapi_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-omgssapi_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+omgssapi_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+omgssapi_la_LDFLAGS = -module -avoid-version
 omgssapi_la_LIBADD = $(gss_libs)
diff --git a/plugins/omlibdbi/Makefile.am b/plugins/omlibdbi/Makefile.am
index de5363ea..872fc67c 100644
--- a/plugins/omlibdbi/Makefile.am
+++ b/plugins/omlibdbi/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = omlibdbi.la
 
 omlibdbi_la_SOURCES = omlibdbi.c
-omlibdbi_la_CPPFLAGS = -I$(top_srcdir) $(libdbi_cflags) $(pthreads_cflags) $(mudflap_cflags)
-omlibdbi_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+omlibdbi_la_CPPFLAGS = -I$(top_srcdir) $(libdbi_cflags) $(pthreads_cflags)
+omlibdbi_la_LDFLAGS = -module -avoid-version
 omlibdbi_la_LIBADD = $(libdbi_libs)
diff --git a/plugins/ommysql/Makefile.am b/plugins/ommysql/Makefile.am
index 4e5c1548..3b4e6d75 100644
--- a/plugins/ommysql/Makefile.am
+++ b/plugins/ommysql/Makefile.am
@@ -1,8 +1,8 @@
 pkglib_LTLIBRARIES = ommysql.la
 
 ommysql_la_SOURCES = ommysql.c ommysql.h
-ommysql_la_CPPFLAGS = -I$(top_srcdir) $(mysql_cflags) $(pthreads_cflags) $(mudflap_cflags)
-ommysql_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+ommysql_la_CPPFLAGS = -I$(top_srcdir) $(mysql_cflags) $(pthreads_cflags)
+ommysql_la_LDFLAGS = -module -avoid-version
 ommysql_la_LIBADD = $(mysql_libs)
 
 EXTRA_DIST = createDB.sql contrib/delete_mysql 
diff --git a/plugins/ompgsql/Makefile.am b/plugins/ompgsql/Makefile.am
index ec8b7d91..b2e3effa 100644
--- a/plugins/ompgsql/Makefile.am
+++ b/plugins/ompgsql/Makefile.am
@@ -1,7 +1,7 @@
 pkglib_LTLIBRARIES = ompgsql.la
 
 ompgsql_la_SOURCES = ompgsql.c ompgsql.h
-ompgsql_la_CPPFLAGS = -I$(top_srcdir) $(pgsql_cflags) $(mudflap_cflags)
+ompgsql_la_CPPFLAGS = -I$(top_srcdir) $(pgsql_cflags)
 ompgsql_la_LDFLAGS = -module -avoid-version
 ompgsql_la_LIBADD = $(pgsql_libs)
 
diff --git a/plugins/omsnmp/Makefile.am b/plugins/omsnmp/Makefile.am
index f4afd09c..d74f7bb4 100644
--- a/plugins/omsnmp/Makefile.am
+++ b/plugins/omsnmp/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = omsnmp.la
 
 omsnmp_la_SOURCES = omsnmp.c omsnmp.h
-omsnmp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-omsnmp_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+omsnmp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+omsnmp_la_LDFLAGS = -module -avoid-version
 omsnmp_la_LIBADD =  $(snmp_libs)
diff --git a/plugins/omtesting/Makefile.am b/plugins/omtesting/Makefile.am
index 83e64155..7e376683 100644
--- a/plugins/omtesting/Makefile.am
+++ b/plugins/omtesting/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = omtesting.la
 
 omtesting_la_SOURCES = omtesting.c
-omtesting_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags)
-omtesting_la_LDFLAGS = $(mudflap_libs) -module -avoid-version
+omtesting_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+omtesting_la_LDFLAGS = -module -avoid-version
 omtesting_la_LIBADD = 
-- 
cgit