bindings: Re-enable Java, but ignore create_analog_packet().

This will need some fixing.

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 3ca7d1aaa8a94daac0af6057006bfa2f4ad887bb..413fb93ab44c6813672df832f51250dbc48ab371 100644 (file)
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -389,4 +389,8 @@ typedef jobject jsourcecallback;
 %define %enumextras(Class)
 %enddef
 
+/* Ignore this for now, needs a fix. */
+%ignore sigrok::Context::create_analog_packet;
+
 %include "bindings/swig/classes.i"
+

diff --git a/configure.ac b/configure.ac
index 2879b2794ce808cc8f81dbccd30168fea86b769f..d28306149760eabaddcd394f393d3cd2bab5056b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -513,9 +513,6 @@ AM_CONDITIONAL(BINDINGS_CXX, test x$BINDINGS_CXX = xyes)
 
 AM_CONDITIONAL(BINDINGS_PYTHON, test x$BINDINGS_PYTHON = xyes)
 
-# Temporarily disable Java bindings, they need a bugfix.
-BINDINGS_JAVA="no"; java_msg="temporarily disabled, needs a bugfix"
-
 AM_CONDITIONAL(BINDINGS_JAVA, test x$BINDINGS_JAVA = xyes)
 
 # Checks for header files.