diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-25 16:00:48 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-25 16:00:48 +0200 |
commit | 98f9b91517e1639e365e396674525cef36e21956 (patch) | |
tree | 3054c86155ec42970f46496f4bb9045d0ba8c4f6 | |
parent | 5b08f0cbc3f73700f852a65ad5a3284c71265536 (diff) | |
parent | b3e16a9f531dff0d973be3917eca114ab6ab7c45 (diff) | |
download | rsyslog-98f9b91517e1639e365e396674525cef36e21956.tar.gz rsyslog-98f9b91517e1639e365e396674525cef36e21956.tar.xz rsyslog-98f9b91517e1639e365e396674525cef36e21956.zip |
Merge branch 'v4-devel' into beta
-rw-r--r-- | ChangeLog | 20 | ||||
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | tests/Makefile.am | 4 |
4 files changed, 24 insertions, 12 deletions
@@ -95,6 +95,17 @@ Version 4.5.0 [DEVEL] (rgerhards), 2009-07-02 This could lead to timestamps written in the wrong format, but not to an abort --------------------------------------------------------------------------- +Version 4.4.1 [v4-stable] (rgerhards), 2009-08-?? +- features requiring Java are automatically disabled if Java is not + present (thanks to Michael Biebl for his help!) +- bugfix: invalid double-quoted PRI, among others in outgoing messages + This causes grief with all receivers. + Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=147 +- bugfix: Java testing tools were required, even if testbench was disabled + This resulted in build errors if no Java was present on the build system, + even though none of the selected option actually required Java. + (I forgot to backport a similar fix to newer releases). +--------------------------------------------------------------------------- Version 4.4.0 [v4-stable] (rgerhards), 2009-08-21 - bugfix: stderr/stdout were not closed to be able to emit error messages, but this caused ssh sessions to hang. Now we close them after the @@ -156,15 +167,6 @@ Version 4.3.0 [DEVEL] (rgerhards), 2009-04-17 connection broke, but not if there was a problem with statement execution. The most probable case for such a case would be invalid sql inside the template, and this is now much easier to diagnose. -<<<<<<< HEAD:ChangeLog ---------------------------------------------------------------------------- -Version 4.2.1 [v4-stable] (rgerhards), 2009-0?-?? -- bugfix: stderr/stdout were not closed to be able to emit error messages, - but this caused ssh sessions to hang. Now we close them after the - initial initialization. See forum thread: - http://kb.monitorware.com/controlling-terminal-issues-t9875.html -======= ->>>>>>> bd7542b51593739893922e8ec8fb6d7195d06cbe:ChangeLog --------------------------------------------------------------------------- Version 4.2.0 [v4-stable] (rgerhards), 2009-06-23 - bugfix: light and full delay watermarks had invalid values, badly diff --git a/Makefile.am b/Makefile.am index 8a130655..a050e95e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,6 @@ sbin_PROGRAMS = pkglib_LTLIBRARIES = - if ENABLE_INET pkglib_LTLIBRARIES += lmtcpsrv.la lmtcpclt.la # diff --git a/configure.ac b/configure.ac index ab0c3a33..19d738eb 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,12 @@ AC_CONFIG_HEADERS([config.h]) AC_GNU_SOURCE +# check for Java compiler +AC_CHECK_PROG(HAVE_JAVAC, [javac], [yes]) +if test x"$HAVE_JAVAC" = x"yes"; then + AC_MSG_WARN([no javac found, disabling features depending on it]) +fi + # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O @@ -690,6 +696,11 @@ 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) diff --git a/tests/Makefile.am b/tests/Makefile.am index c50b7cd6..c5deaa47 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,14 +20,14 @@ TESTS += omod-if-array.sh \ fieldtest.sh endif +check_JAVA = DiagTalker.java + endif # if ENABLE_TESTBENCH TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/ DISTCLEANFILES=rsyslog.pid '$(abs_top_builddir)'/DiagTalker.class test_files = testbench.h runtime-dummy.c -check_JAVA = DiagTalker.java - EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ validation-run.sh \ testsuites/invalid.conf \ |