For Java >= 8 use javac with option -h instead of javah

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9dc323e987)

admin

@@ -1 +1 @@
-Subproject commit b5373d6ec2d9431fa6c1c218137f9e3f5ca1f4af
+Subproject commit 5200a0cc9da98d7798aa80a7c35e29e70d4c2927

dcopjava/binding/Makefile.am

@@ -12,7 +12,9 @@ client.lo: org_trinitydesktop_DCOP_Client.h
 
 org_trinitydesktop_DCOP_Client.h:
 	$(MAKE) -C org
-	$(JAVAH)  -classpath .:$(srcdir) -jni org.trinitydesktop.DCOP.Client
+	if ! $(JAVA8); then \
+	  $(JAVAH) -classpath .:$(srcdir) -jni org.trinitydesktop.DCOP.Client; \
+	fi
 
 SUBDIRS = org
 

dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am

@@ -4,6 +4,10 @@ classdir = $(kde_libraries)/java/org/trinitydesktop/DCOP
 SUFFIXES = .java .class
 
 .java.class:
-	CLASSPATH=$(top_srcdir)/dcopjava/binding  $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/trinitydesktop/DCOP/$*.java
+	if $(JAVA8); then \
+	  CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/trinitydesktop/DCOP/$*.java -h ../../..; \
+	else \
+	  CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/trinitydesktop/DCOP/$*.java; \
+	fi
 
 CLEANFILES = $(class_DATA)