diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-17 15:13:20 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-17 15:13:20 +0100 |
| commit | 9f1e195f3d642de85a92199ef9882b820d3fec21 (patch) | |
| tree | 5f0030bcec760746c2aafc54304c76ca329a4728 | |
| parent | 39406781e51c7305cb9f35f5f9fed9c10dea9ecd (diff) | |
| parent | 84c9bbaffc652cc2cb56389646ce329e8e1bb26a (diff) | |
| download | rsyslog-9f1e195f3d642de85a92199ef9882b820d3fec21.tar.gz rsyslog-9f1e195f3d642de85a92199ef9882b820d3fec21.tar.xz rsyslog-9f1e195f3d642de85a92199ef9882b820d3fec21.zip | |
Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 2 insertions, 5 deletions
@@ -98,6 +98,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 1db9f26e..987711e0 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) |