diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-26 12:10:55 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-26 12:10:55 +0200 |
| commit | a34cd19763ff2703301060b30e9fa77e275fd2b5 (patch) | |
| tree | 668c1ac059dd37244fa09c5bc4d84258932e4fd0 | |
| parent | b5b26c2960fb8de308a5f7aef1b13f44b0d76b2c (diff) | |
| parent | 98f9b91517e1639e365e396674525cef36e21956 (diff) | |
| download | rsyslog-a34cd19763ff2703301060b30e9fa77e275fd2b5.tar.gz rsyslog-a34cd19763ff2703301060b30e9fa77e275fd2b5.tar.xz rsyslog-a34cd19763ff2703301060b30e9fa77e275fd2b5.zip | |
Merge branch 'beta'
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 11 |
3 files changed, 22 insertions, 1 deletions
@@ -206,6 +206,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 diff --git a/Makefile.am b/Makefile.am index 34bb8f0d..7ab48455 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 e9bc9c9d..6694a185 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 @@ -691,6 +697,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) |