diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-26 08:04:34 +0000 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-26 08:04:34 +0000 |
commit | d839bc3fa3018e54ca82055988928c76fca98496 (patch) | |
tree | 902d02db3efdd7ab31c8b9d9b7bd51849532a996 | |
parent | ee7a17a6792e178541d0504fb6ceaae6d625e463 (diff) | |
download | rsyslog-d839bc3fa3018e54ca82055988928c76fca98496.tar.gz rsyslog-d839bc3fa3018e54ca82055988928c76fca98496.tar.xz rsyslog-d839bc3fa3018e54ca82055988928c76fca98496.zip |
applied Michael Biebl's fix for building rsyslog core without gssapi
support
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.am | 14 | ||||
-rw-r--r-- | doc/rsyslog_ng_comparison.html | 2 | ||||
-rw-r--r-- | plugins/imtcp/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/omgssapi/Makefile.am | 2 |
5 files changed, 18 insertions, 9 deletions
@@ -1,5 +1,7 @@ --------------------------------------------------------------------------- Version 3.12.0 (rgerhards), 2008-02-?? +- bugfix: gssapi libraries were still linked to rsyslog core, what should + no longer be necessary. Applied fix by Michael Biebl to solve this. --------------------------------------------------------------------------- Version 3.11.5 (rgerhards), 2008-02-25 - new imgssapi module, changed imtcp module - this enables to load/package diff --git a/Makefile.am b/Makefile.am index 4d6865cd..cbf9abaf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,14 +85,18 @@ rsyslogd_SOURCES = \ iminternal.c \ iminternal.h \ action.c \ - action.h \ - gss-misc.c \ - gss-misc.h + action.h rsyslogd_CPPFLAGS = $(mudflap_cflags) -D_PATH_MODDIR=\"$(pkglibdir)/\" $(pthreads_cflags) -rsyslogd_LDADD = $(mudflap_libs) $(zlib_libs) $(pthreads_libs) $(gss_libs) $(dl_libs) $(rt_libs) +rsyslogd_LDADD = $(mudflap_libs) $(zlib_libs) $(pthreads_libs) $(dl_libs) $(rt_libs) rsyslogd_LDFLAGS = -export-dynamic +if ENABLE_GSSAPI +noinst_LTLIBRARIES = libgssapi-misc.la +libgssapi_misc_la_SOURCES = gss-misc.c gss-misc.h +libgssapi_misc_la_LIBADD = $(gss_libs) +endif + man_MANS = rfc3195d.8 rsyslogd.8 rsyslog.conf.5 EXTRA_DIST = \ @@ -106,7 +110,7 @@ EXTRA_DIST = \ rsyslog.conf \ $(man_MANS) -SUBDIRS = doc +SUBDIRS = . doc SUBDIRS += plugins/immark plugins/imuxsock plugins/imtcp plugins/imudp plugins/omtesting diff --git a/doc/rsyslog_ng_comparison.html b/doc/rsyslog_ng_comparison.html index 53f69442..07ceb09d 100644 --- a/doc/rsyslog_ng_comparison.html +++ b/doc/rsyslog_ng_comparison.html @@ -5,7 +5,7 @@ <h1>rsyslog vs. syslog-ng</h1> <p><small><i>Written by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> (2008-02-15)</i></small></p> -<p>We have often been asked abut a comparison sheet between +<p>We have often been asked about a comparison sheet between rsyslog and syslog-ng. Unfortunately, I do not know much about syslog-ng, I did not even use it once. Also, there seems to be no comprehensive feature sheet available for syslog-ng (that recently changed, see diff --git a/plugins/imtcp/Makefile.am b/plugins/imtcp/Makefile.am index fc4d00ae..36cff50a 100644 --- a/plugins/imtcp/Makefile.am +++ b/plugins/imtcp/Makefile.am @@ -1,4 +1,7 @@ -pkglib_LTLIBRARIES = imtcp.la imgssapi.la +pkglib_LTLIBRARIES = imtcp.la +if ENABLE_GSSAPI +pkglib_LTLIBRARIES += imgssapi.la +endif imtcp_la_SOURCES = imtcp.c imtcp_la_CPPFLAGS = -DFORCE_NO_GSS=1 -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags) @@ -7,4 +10,4 @@ imtcp_la_LDFLAGS = $(mudflap_libs) -module -avoid-version imgssapi_la_SOURCES = imtcp.c imgssapi_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(mudflap_cflags) imgssapi_la_LDFLAGS = $(mudflap_libs) -module -avoid-version -imgssapi_la_LIBADD = $(gss_libs) +imgssapi_la_LIBADD = $(gss_libs) $(top_builddir)/libgssapi-misc.la diff --git a/plugins/omgssapi/Makefile.am b/plugins/omgssapi/Makefile.am index 3ec18282..3557388c 100644 --- a/plugins/omgssapi/Makefile.am +++ b/plugins/omgssapi/Makefile.am @@ -3,4 +3,4 @@ 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_LIBADD = $(gss_libs) +omgssapi_la_LIBADD = $(gss_libs) $(top_builddir)/libgssapi-misc.la |