Imported Upstream version 3.14.1upstream/3.14.1

1 files changed, 151 insertions, 23 deletions

diff --git a/Makefile.am b/Makefile.am
index 6c1b24b..4b6602b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,29 @@
-sbin_PROGRAMS = rklogd rfc3195d rsyslogd
-
-rklogd_SOURCES = \
-	klogd.c \
-	klogd.h \
-	syslog.c \
-	pidfile.c \
-	pidfile.h \
-	ksym.c \
-	ksyms.h \
-	ksym_mod.c \
-	module.h
-
-rfc3195d_SOURCES = rfc3195d.c rsyslog.h
+#sbin_PROGRAMS = rfc3195d rsyslogd
+sbin_PROGRAMS =
+man_MANS = 
 
+if ENABLE_RSYSLOGD
+sbin_PROGRAMS += rsyslogd
 rsyslogd_SOURCES = \
+	datetime.c \
+	datetime.h \
+	errmsg.c \
+	errmsg.h \
 	syslogd.c \
 	syslogd.h \
+	sysvar.c \
+	sysvar.h \
+	vm.c \
+	vm.h \
+	vmstk.c \
+	vmstk.h \
+	vmprg.c \
+	vmprg.h \
+	vmop.c \
+	vmop.h \
+	debug.c \
+	debug.h \
+	glbl.h \
 	pidfile.c \
 	pidfile.h \
 	template.c \
@@ -30,13 +38,33 @@ rsyslogd_SOURCES = \
 	template.h \
 	outchannel.h \
 	liblogging-stub.h \
+	threads.c \
+	threads.h \
+	stream.c \
+	stream.h \
+	var.c \
+	var.h \
+	wtp.c \
+	wtp.h \
+	wti.c \
+	wti.h \
+	queue.c \
+	queue.h \
 	sync.c \
 	sync.h \
-	net.c \
-	net.h \
+	obj.c \
+	obj.h \
+	obj-types.h \
 	msg.c \
 	msg.h \
 	expr.c \
+	expr.h \
+	ctok.c \
+	ctok.h \
+	ctok_token.c \
+	ctok_token.h \
+	conf.c \
+	conf.h \
 	omshell.c \
 	omshell.h \
 	omusrmsg.c \
@@ -62,14 +90,88 @@ rsyslogd_SOURCES = \
 	iminternal.h \
 	action.c \
 	action.h \
-	gss-misc.c \
-	gss-misc.h
+	atomic.h
 
-rsyslogd_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/\" $(pthreads_cflags)
-rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(gss_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
 
-man_MANS = rfc3195d.8 rklogd.8 rsyslogd.8 rsyslog.conf.5 
+man_MANS += rsyslogd.8 rsyslog.conf.5 
+
+endif # if ENABLE_RSYSLOGD
+
+# now come the library plugins
+pkglib_LTLIBRARIES = 
+
+if ENABLE_RFC3195
+# this does so far not work - a manual build is needed
+sbin_PROGRAMS += rfc3195d
+rfc3195d_SOURCES = rfc3195d.c rsyslog.h
+man_MANS += rfc3195d.8
+endif
+
+
+if ENABLE_INET
+pkglib_LTLIBRARIES += lmnet.la lmtcpsrv.la lmtcpclt.la
+#
+# network support
+# 
+lmnet_la_SOURCES = net.c net.h
+lmnet_la_CPPFLAGS = $(pthreads_cflags)
+lmnet_la_LDFLAGS = -module -avoid-version
+lmnet_la_LIBADD =
+#
+#
+# TCP (stream) server support
+#
+lmtcpsrv_la_SOURCES = \
+	tcps_sess.c \
+	tcps_sess.h \
+	tcpsrv.c \
+	tcpsrv.h
+lmtcpsrv_la_CPPFLAGS = $(pthreads_cflags)
+lmtcpsrv_la_LDFLAGS = -module -avoid-version
+lmtcpsrv_la_LIBADD = 
+
+#
+# TCP (stream) client support
+#
+lmtcpclt_la_SOURCES = \
+	tcpclt.c \
+	tcpclt.h
+lmtcpclt_la_CPPFLAGS = $(pthreads_cflags)
+lmtcpclt_la_LDFLAGS = -module -avoid-version
+lmtcpclt_la_LIBADD = 
+
+endif # if ENABLE_INET
+
+#
+# regular expression support
+# 
+if ENABLE_REGEXP
+pkglib_LTLIBRARIES += lmregexp.la
+lmregexp_la_SOURCES = regexp.c regexp.h
+lmregexp_la_CPPFLAGS = $(pthreads_cflags)
+lmregexp_la_LDFLAGS = -module -avoid-version
+lmregexp_la_LIBADD =
+endif
+
+#
+# gssapi support
+# 
+if ENABLE_GSSAPI
+pkglib_LTLIBRARIES += lmgssutil.la
+lmgssutil_la_SOURCES = gss-misc.c gss-misc.h
+lmgssutil_la_CPPFLAGS = $(pthreads_cflags)
+lmgssutil_la_LDFLAGS = -module -avoid-version
+lmgssutil_la_LIBADD = $(gss_libs)
+endif
+
+#
+# relp support
+# 
+if ENABLE_RELP
+endif
 
 EXTRA_DIST = \
 	redhat/rsyslog.conf \
@@ -79,19 +181,45 @@ EXTRA_DIST = \
 	freebsd/rsyslogd \
 	slackware/rc.rsyslogd \
 	contrib/README \
+	rsyslog.conf \
 	$(man_MANS)
 
-SUBDIRS = doc
+SUBDIRS = . doc
 
+SUBDIRS += plugins/immark plugins/imuxsock plugins/imtcp plugins/imudp plugins/omtesting
+
+if ENABLE_IMKLOGD
+SUBDIRS += plugins/imklog
+endif
 
 if ENABLE_GSSAPI
-SUBDIRS += plugins/omgssapi
+SUBDIRS += plugins/omgssapi plugins/imgssapi
+endif
+
+if ENABLE_RELP
+SUBDIRS += plugins/omrelp plugins/imrelp
 endif
 
 if ENABLE_MYSQL
 SUBDIRS += plugins/ommysql
 endif
 
+if ENABLE_OMLIBDBI
+SUBDIRS += plugins/omlibdbi
+endif
+
 if ENABLE_PGSQL
 SUBDIRS += plugins/ompgsql
 endif
+
+if ENABLE_SNMP
+SUBDIRS += plugins/omsnmp
+endif
+
+if ENABLE_IMTEMPLATE
+SUBDIRS += plugins/imtemplate
+endif
+
+if ENABLE_IMFILE
+SUBDIRS += plugins/imfile
+endif