diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 14:18:30 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 14:18:30 +0200 |
| commit | 63988ba095656ae0629a52a2ac8c2930ac4ddc20 (patch) | |
| tree | d340ff31a2468e8b2ce38d8aa5738d0e362e2f8d /configure.ac | |
| parent | ede0dbf1a3ee528f059903d4dfad96a91fe55186 (diff) | |
| parent | fa9684d8c6faa8f2e808de9229b254d77844aa2c (diff) | |
| download | rsyslog-63988ba095656ae0629a52a2ac8c2930ac4ddc20.tar.gz rsyslog-63988ba095656ae0629a52a2ac8c2930ac4ddc20.tar.xz rsyslog-63988ba095656ae0629a52a2ac8c2930ac4ddc20.zip | |
Merge branch 'master' into java
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 3fe27683..7d1b50b4 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) |