rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-21 11:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'radosroka-tmp_master' into master-candidate

Browse Source
This commit is contained in:
Andre Lorbach 2015-08-07 00:34:06 -07:00
commit 6492b67074
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -49,6 +49,11 @@ Version 8.12.0 [v8-stable] 2015-08-11
Thanks to Anton Matveenko for the patch
- testbench: remove raciness from UDP based tests
- testbench: added bash into all scripts makign it mandatory
- bugfix testbench: Fixed problem building syslog_caller util when
liblogging-stdlog is not available.
Thanks to Louis Bouchard for the patch
- bugfix rscryutil.1: Added fix checking for generate_man_pages condition
Thanks to Radovan Sroka for the patch
------------------------------------------------------------------------------
Version 8.11.0 [v8-stable] 2015-06-30
- new signature provider for Keyless Signature Infrastructure (KSI) added

3
configure.ac
View File

@ -1615,7 +1615,6 @@ AC_ARG_ENABLE(generate-man-pages,
esac],
[have_to_generate_man_pages=no]
)
AM_CONDITIONAL(ENABLE_GENERATE_MAN_PAGES, test x$have_to_generate_man_pages = xyes)
# This provides a work-around to use "make distcheck" by disabling
@ -1657,6 +1656,8 @@ else
fi
AM_CONDITIONAL(ENABLE_GENERATE_MAN_PAGES, test x$have_to_generate_man_pages = xyes)
# rst2man
AC_CHECK_PROGS([RST2MAN], [rst2man rst2man.py], [false])
if test "x$have_to_generate_man_pages" = "xyes" && test "x$RST2MAN" = "xfalse"; then