diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 17 |
2 files changed, 21 insertions, 1 deletions
@@ -1,5 +1,10 @@ --------------------------------------------------------------------------- Version 7.3.16 [beta] 2013-05-?? +- add --enable-cached-man-pages ./configure option + permits to build rsyslog on a system where rst2man is not installed. In + that case, cached versions of the man pages are used (they were built + during "make dist", so they should be current for the version in + question. - imjournal: no longer do periodic wakeup - bugfix: potential hang *in debug mode* on rsyslogd termination This ONLY affected rsyslogd if it were running with debug output diff --git a/configure.ac b/configure.ac index fd9cea83..a43e0292 100644 --- a/configure.ac +++ b/configure.ac @@ -1000,16 +1000,30 @@ fi AM_CONDITIONAL(ENABLE_GUARDTIME, test x$enable_guardtime = xyes) +# Support using cached man file copies, to avoid the need for rst2man +# in the build environment +AC_ARG_ENABLE(cached_man_pages, + [AS_HELP_STRING([--enable-cached-man-pages],[Enable using cached versions of man files (avoid rst2man) @<:@default=no@:>@])], + [case "${enableval}" in + yes) enable_cached_man_pages="yes" ;; + no) enable_cached_man_pages="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-cached-man-pages) ;; + esac], + [enable_cached_man_pages=no] +) +if test "x$enable_cached_man_pages" = "xno"; then # obtain path for rst2man -if test "x$enable_libgcrypt" = "xyes" || \ + if test "x$enable_libgcrypt" = "xyes" || \ "x$enable_guardtime" = "xyes"; then AC_PATH_PROG([RST2MAN], [rst2man]) if test "x${RST2MAN}" == "x"; then AC_MSG_FAILURE([rst2man not found in PATH]) fi + fi fi + # RFC 3195 support AC_ARG_ENABLE(rfc3195, [AS_HELP_STRING([--enable-rfc3195],[Enable RFC3195 support @<:@default=no@:>@])], @@ -1487,6 +1501,7 @@ echo " Zlib compression support enabled: $enable_zlib" echo " rsyslog runtime will be built: $enable_rsyslogrt" echo " rsyslogd will be built: $enable_rsyslogd" echo " GUI components will be built: $enable_gui" +echo " cached man files will be used: $enable_cached_man_pages" echo " Unlimited select() support enabled: $enable_unlimited_select" echo " uuid support enabled: $enable_uuid" echo " Log file signing support: $enable_guardtime" |