diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-25 15:59:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-25 15:59:46 +0200 |
| commit | b3e16a9f531dff0d973be3917eca114ab6ab7c45 (patch) | |
| tree | 498598eda1810eaa6b892a3c36e153f9bdabf282 /configure.ac | |
| parent | d8ab04b533a6d2fc224e1931463b91508cc6d701 (diff) | |
| parent | 1164429974dcd71ef59dededd3fec54162d919dd (diff) | |
| download | rsyslog-b3e16a9f531dff0d973be3917eca114ab6ab7c45.tar.gz rsyslog-b3e16a9f531dff0d973be3917eca114ab6ab7c45.tar.xz rsyslog-b3e16a9f531dff0d973be3917eca114ab6ab7c45.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
runtime/msg.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 11 insertions, 0 deletions
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) |