diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-17 13:40:57 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-17 13:40:57 +0100 |
| commit | 84c9bbaffc652cc2cb56389646ce329e8e1bb26a (patch) | |
| tree | ead79e472bd84c819388737b719fca4f9d9c6613 | |
| parent | 7052d3c378ff600f9f03a05b1918d8eda6b76e2b (diff) | |
| parent | 237df37a86479e1f60e73bdcd1da15ccc319fa15 (diff) | |
| download | rsyslog-84c9bbaffc652cc2cb56389646ce329e8e1bb26a.tar.gz rsyslog-84c9bbaffc652cc2cb56389646ce329e8e1bb26a.tar.xz rsyslog-84c9bbaffc652cc2cb56389646ce329e8e1bb26a.zip | |
Merge branch 'v5-stable' into v5-beta
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 2 insertions, 5 deletions
@@ -92,6 +92,8 @@ Version 5.6.3 [V5-STABLE] (rgerhards), 2011-01-26 - bugfix: batches which had actions in error were not properly retried in all cases - bugfix: imfile did duplicate messages under some circumstances +- bugfix: testbench was not activated if no Java was present on system + ... what actually was a left-over. Java is no longer required. --------------------------------------------------------------------------- Version 5.6.2 [V5-STABLE] (rgerhards), 2010-11-30 - bugfix: compile failed on systems without epoll_create1() diff --git a/configure.ac b/configure.ac index 8eb840b0..deeb68fc 100644 --- a/configure.ac +++ b/configure.ac @@ -809,11 +809,6 @@ AC_ARG_ENABLE(testbench, esac], [enable_testbench=yes] ) -if test "$enable_testbench" = "yes"; then - if test x$HAVE_JAVAC = x; then - enable_testbench='no' - fi -fi AM_CONDITIONAL(ENABLE_TESTBENCH, test x$enable_testbench = xyes) |