summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-08-26 12:10:55 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-08-26 12:10:55 +0200
commita34cd19763ff2703301060b30e9fa77e275fd2b5 (patch)
tree668c1ac059dd37244fa09c5bc4d84258932e4fd0 /configure.ac
parentb5b26c2960fb8de308a5f7aef1b13f44b0d76b2c (diff)
parent98f9b91517e1639e365e396674525cef36e21956 (diff)
downloadrsyslog-a34cd19763ff2703301060b30e9fa77e275fd2b5.tar.gz
rsyslog-a34cd19763ff2703301060b30e9fa77e275fd2b5.tar.xz
rsyslog-a34cd19763ff2703301060b30e9fa77e275fd2b5.zip
Merge branch 'beta'
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac11
1 files changed, 11 insertions, 0 deletions
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)