Imported Upstream version 5.7.1upstream/5.7.1

1 files changed, 106 insertions, 30 deletions

diff --git a/Makefile.in b/Makefile.in
index d076e37..1b54f42 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,7 @@
 @SET_MAKE@
 
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -61,17 +62,19 @@ sbin_PROGRAMS =
 @ENABLE_OMDBALERTING_TRUE@am__append_19 = plugins/omdbalerting
 @ENABLE_OMUDPSPOOF_TRUE@am__append_20 = plugins/omudpspoof
 @ENABLE_OMUXSOCK_TRUE@am__append_21 = plugins/omuxsock
-@ENABLE_OMTEMPLATE_TRUE@am__append_22 = plugins/omtemplate
-@ENABLE_IMFILE_TRUE@am__append_23 = plugins/imfile
-@ENABLE_IMPTCP_TRUE@am__append_24 = plugins/imptcp
-@ENABLE_IMDIAG_TRUE@am__append_25 = plugins/imdiag
-@ENABLE_MAIL_TRUE@am__append_26 = plugins/ommail
-@ENABLE_OMPROG_TRUE@am__append_27 = plugins/omprog
-@ENABLE_RFC3195_TRUE@am__append_28 = plugins/im3195
-@ENABLE_ORACLE_TRUE@am__append_29 = plugins/omoracle
-@ENABLE_GUI_TRUE@am__append_30 = java
+@ENABLE_OMHDFS_TRUE@am__append_22 = plugins/omhdfs
+@ENABLE_OMTEMPLATE_TRUE@am__append_23 = plugins/omtemplate
+@ENABLE_IMFILE_TRUE@am__append_24 = plugins/imfile
+@ENABLE_IMPTCP_TRUE@am__append_25 = plugins/imptcp
+@ENABLE_IMDIAG_TRUE@am__append_26 = plugins/imdiag
+@ENABLE_MAIL_TRUE@am__append_27 = plugins/ommail
+@ENABLE_OMPROG_TRUE@am__append_28 = plugins/omprog
+@ENABLE_RFC3195_TRUE@am__append_29 = plugins/im3195
+@ENABLE_ORACLE_TRUE@am__append_30 = plugins/omoracle
+@ENABLE_GUI_TRUE@am__append_31 = java
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = README $(am__configure_deps) \
+	$(am__dist_systemdsystemunit_DATA_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING COPYING.LESSER \
 	ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
@@ -111,7 +114,9 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sbindir)"
+am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sbindir)" \
+	"$(DESTDIR)$(systemdsystemunitdir)" \
+	"$(DESTDIR)$(systemdsystemunitdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @ENABLE_GSSAPI_TRUE@lmgssutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -183,6 +188,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__dist_systemdsystemunit_DATA_DIST = rsyslog.socket
+DATA = $(dist_systemdsystemunit_DATA) $(nodist_systemdsystemunit_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -198,9 +205,10 @@ DIST_SUBDIRS = doc runtime . plugins/immark plugins/imuxsock \
 	plugins/ompgsql plugins/omsnmp plugins/cust1 \
 	plugins/imtemplate plugins/omstdout plugins/pmlastmsg \
 	plugins/pmrfc3164sd plugins/omruleset plugins/omdbalerting \
-	plugins/omudpspoof plugins/omuxsock plugins/omtemplate \
-	plugins/imfile plugins/imptcp plugins/imdiag plugins/ommail \
-	plugins/omprog plugins/im3195 plugins/omoracle java tests
+	plugins/omudpspoof plugins/omuxsock plugins/omhdfs \
+	plugins/omtemplate plugins/imfile plugins/imptcp \
+	plugins/imdiag plugins/ommail plugins/omprog plugins/im3195 \
+	plugins/omoracle java tests
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -378,6 +386,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -411,6 +420,19 @@ pkglib_LTLIBRARIES = $(am__append_1) $(am__append_2)
 @ENABLE_GSSAPI_TRUE@lmgssutil_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
 @ENABLE_GSSAPI_TRUE@lmgssutil_la_LDFLAGS = -module -avoid-version
 @ENABLE_GSSAPI_TRUE@lmgssutil_la_LIBADD = $(GSS_LIBS)
+
+#
+# systemd support
+#
+@HAVE_SYSTEMD_TRUE@dist_systemdsystemunit_DATA = \
+@HAVE_SYSTEMD_TRUE@	rsyslog.socket
+
+@HAVE_SYSTEMD_TRUE@nodist_systemdsystemunit_DATA = \
+@HAVE_SYSTEMD_TRUE@	rsyslog.service
+
+@HAVE_SYSTEMD_TRUE@CLEANFILES = \
+@HAVE_SYSTEMD_TRUE@	rsyslog.service
+
 EXTRA_DIST = \
 	freebsd/rsyslogd \
 	slackware/rc.rsyslogd \
@@ -419,7 +441,8 @@ EXTRA_DIST = \
 	COPYING.LESSER \
 	contrib/gnutls/ca.pem \
 	contrib/gnutls/cert.pem \
-	contrib/gnutls/key.pem
+	contrib/gnutls/key.pem \
+	rsyslog.service.in
 
 
 # tests are added as last element, because tests may need different
@@ -434,7 +457,8 @@ SUBDIRS = doc runtime . plugins/immark plugins/imuxsock plugins/imtcp \
 	$(am__append_19) $(am__append_20) $(am__append_21) \
 	$(am__append_22) $(am__append_23) $(am__append_24) \
 	$(am__append_25) $(am__append_26) $(am__append_27) \
-	$(am__append_28) $(am__append_29) $(am__append_30) tests
+	$(am__append_28) $(am__append_29) $(am__append_30) \
+	$(am__append_31) tests
 
 # make sure "make distcheck" tries to build all modules. This means that
 # a developer must always have an environment where every supporting library
@@ -464,7 +488,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gssapi_krb5 \
 				--enable-shave \
 				--enable-extended-tests \
 				--enable-impstats \
-				--enable-memcheck
+				--enable-memcheck \
+				--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 ACLOCAL_AMFLAGS = -I m4
 all: config.h
@@ -679,6 +704,46 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool config.lt
+install-dist_systemdsystemunitDATA: $(dist_systemdsystemunit_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(systemdsystemunitdir)" || $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)"
+	@list='$(dist_systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemdsystemunitdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(systemdsystemunitdir)" || exit $$?; \
+	done
+
+uninstall-dist_systemdsystemunitDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(systemdsystemunitdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(systemdsystemunitdir)" && rm -f $$files
+install-nodist_systemdsystemunitDATA: $(nodist_systemdsystemunit_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(systemdsystemunitdir)" || $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)"
+	@list='$(nodist_systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemdsystemunitdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(systemdsystemunitdir)" || exit $$?; \
+	done
+
+uninstall-nodist_systemdsystemunitDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(systemdsystemunitdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(systemdsystemunitdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -992,10 +1057,10 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sbindir)"; do \
+	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -1015,6 +1080,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1047,7 +1113,8 @@ info: info-recursive
 
 info-am:
 
-install-data-am:
+install-data-am: install-dist_systemdsystemunitDATA \
+	install-nodist_systemdsystemunitDATA
 
 install-dvi: install-dvi-recursive
 
@@ -1095,7 +1162,9 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-pkglibLTLIBRARIES uninstall-sbinPROGRAMS
+uninstall-am: uninstall-dist_systemdsystemunitDATA \
+	uninstall-nodist_systemdsystemunitDATA \
+	uninstall-pkglibLTLIBRARIES uninstall-sbinPROGRAMS
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
 	ctags-recursive install-am install-strip tags-recursive
@@ -1108,18 +1177,25 @@ uninstall-am: uninstall-pkglibLTLIBRARIES uninstall-sbinPROGRAMS
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-sbinPROGRAMS install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	install install-am install-data install-data-am \
+	install-dist_systemdsystemunitDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man \
+	install-nodist_systemdsystemunitDATA install-pdf \
+	install-pdf-am install-pkglibLTLIBRARIES install-ps \
+	install-ps-am install-sbinPROGRAMS install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-dist_systemdsystemunitDATA \
+	uninstall-nodist_systemdsystemunitDATA \
 	uninstall-pkglibLTLIBRARIES uninstall-sbinPROGRAMS
 
 
+@HAVE_SYSTEMD_TRUE@%.service: %.service.in
+@HAVE_SYSTEMD_TRUE@	$(AM_V_GEN)sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: