diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 12:13:01 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 12:13:01 +0200 |
| commit | 8cd291a0c9eab23fa020d6560715a32c3370f78b (patch) | |
| tree | e89b794ccedbae3c46aa406f29fc5ce7a7f915b7 /configure.ac | |
| parent | aba8792c8a82ef52a3188ee7295e501ca21dae3b (diff) | |
| parent | 7aa30acc744ae53aab2a0b2e3d1a1b0081d9e393 (diff) | |
| download | rsyslog-8cd291a0c9eab23fa020d6560715a32c3370f78b.tar.gz rsyslog-8cd291a0c9eab23fa020d6560715a32c3370f78b.tar.xz rsyslog-8cd291a0c9eab23fa020d6560715a32c3370f78b.zip | |
Merge branch 'v4-stable' into v4-beta
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) |