diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-25 12:14:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-25 12:14:50 +0200 |
| commit | 8c125325cf239d7303e0f479b284fd1f59c223f7 (patch) | |
| tree | e6c336deedb753f23e87c54b638480640f6b0559 | |
| parent | 03918b4478f5523873af32e3f9a62222f5ab7f20 (diff) | |
| download | rsyslog-8c125325cf239d7303e0f479b284fd1f59c223f7.tar.gz rsyslog-8c125325cf239d7303e0f479b284fd1f59c223f7.tar.xz rsyslog-8c125325cf239d7303e0f479b284fd1f59c223f7.zip | |
features requiring Java are automatically disabled if Java is not present
(thanks to Michael Biebl for his help!)
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 11 |
3 files changed, 13 insertions, 1 deletions
@@ -1,5 +1,7 @@ --------------------------------------------------------------------------- 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: 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. 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 6be11b0d..fec55863 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 @@ -689,6 +695,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) |