From b71356d63104635116e556cd51daa0904e28fc99 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Fri, 14 Nov 2014 16:47:46 +0100
Subject: [PATCH] bindings: Re-enable Java, but ignore create_analog_packet().

This will need some fixing.
---
 bindings/java/org/sigrok/core/classes/classes.i | 4 ++++
 configure.ac                                    | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 3ca7d1aa..413fb93a 100644
--- 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 2879b279..d2830614 100644
--- 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.