From 84b448ee060c9ca40ca9324c0df9a49f4f4bd32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pinkava?= Date: Sun, 23 Nov 2014 17:38:28 +0100 Subject: [PATCH] Do not check for JDK headers if Java bindings are disabled. This removes an unnecessary build dependency on JDK and fixes build troubles on systems where javac is present but JDK is not installed and Java bindings are disabled by ./configure --disable-java. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d2830614..396e3ec2 100644 --- a/configure.ac +++ b/configure.ac @@ -434,7 +434,7 @@ CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibin # Find Java compiler and JNI includes for Java bindings. AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no]) -if test "x$HAVE_JAVAC" = "xyes"; then +if test "x$HAVE_JAVAC" = "xyes" && test "x$BINDINGS_JAVA" = "xyes"; then AX_PROG_JAVAC if test "x$JNI_INCLUDE_DIRS" = "xauto"; then if test "x$cross_compiling" = "xyes"; then