java compilation is javac friendly

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 8fd6c8cfeca6b4629dd3b6cc1dabba3a99aa77d3..9d9c797c1295694e98bc987df709539b51d6627f 100644 (file)
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -50,8 +50,8 @@ export LIBJINCLUDES
 
 # Build targets
 
-%.class: %.java 
-       $(JAVAC) $? 
+%.class: %.java
+       $(JAVAC) $?
 
 VlcClient: $(OBJECTS)
        $(JAVAC) VlcClient.java
@@ -62,6 +62,6 @@ VLCExample: $(OBJECTS)
 all-am: VlcClient VLCExample
 
 clean-local:
-       rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h src/*.o *.so *.o *.dll
+       rm -f *.class *~ org/videolan/jvlc/*.class src/*.o *.so *.o *.dll
 
 endif

diff --git a/configure.ac b/configure.ac
index 04071e48b57b1c29ff936093a7106171cd013895..57e607afb0bd4caac95b812b9e1397eac44f7419 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5584,6 +5584,10 @@ then
   AC_PROG_JAVAC
   AC_PROG_JAVA
   PLUGINS_BINDINGS="${PLUGINS_BINDINGS} java"
+  if test "${JAVAC}" == "javac"
+  then
+    JAVAC="javac -cp ./ "
+  fi
 fi
 AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"])