summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-02-26 08:04:34 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-02-26 08:04:34 +0000
commitd839bc3fa3018e54ca82055988928c76fca98496 (patch)
tree902d02db3efdd7ab31c8b9d9b7bd51849532a996 /Makefile.am
parentee7a17a6792e178541d0504fb6ceaae6d625e463 (diff)
downloadrsyslog-d839bc3fa3018e54ca82055988928c76fca98496.tar.gz
rsyslog-d839bc3fa3018e54ca82055988928c76fca98496.tar.xz
rsyslog-d839bc3fa3018e54ca82055988928c76fca98496.zip
applied Michael Biebl's fix for building rsyslog core without gssapi
support
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am14
1 files changed, 9 insertions, 5 deletions
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