]> sigrok.org Git - libsigrok.git/commitdiff
Do not check for JDK headers if Java bindings are disabled.
authorJiří Pinkava <redacted>
Sun, 23 Nov 2014 16:38:28 +0000 (17:38 +0100)
committerUwe Hermann <redacted>
Sun, 23 Nov 2014 16:58:21 +0000 (17:58 +0100)
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

index d28306149760eabaddcd394f393d3cd2bab5056b..396e3ec21345c10b6bb424e7ea8492332e397b75 100644 (file)
@@ -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