configury: replace javah with javac -h

javah has been removed from Java 10, so use javac -h instead
(that is already usable in Java 8)

Refs. #5000

Signed-off-by: Gilles Gouaillardet <[email protected]>

Author: ggouaillardet

config/opal_setup_java.m4

@@ -15,7 +15,7 @@ dnl                         reserved.
 dnl Copyright (c) 2007-2012 Oracle and/or its affiliates.  All rights reserved.
 dnl Copyright (c) 2008-2013 Cisco Systems, Inc.  All rights reserved.
 dnl Copyright (c) 2013      Intel, Inc.  All rights reserved.
-dnl Copyright (c) 2015      Research Organization for Information Science
+dnl Copyright (c) 2015-2018 Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
 dnl $COPYRIGHT$
@@ -161,13 +161,12 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
             AS_IF([test -n "$with_jdk_bindir" && test "$with_jdk_bindir" != "yes" && test "$with_jdk_bindir" != "no"],
                   [PATH="$with_jdk_bindir:$PATH"])
             AC_PATH_PROG(JAVAC, javac)
-            AC_PATH_PROG(JAVAH, javah)
             AC_PATH_PROG(JAR, jar)
             AC_PATH_PROG(JAVADOC, javadoc)
             PATH=$opal_java_PATH_save
 
-            # Check to see if we have all 4 programs.
-            AS_IF([test -z "$JAVAC" || test -z "$JAVAH" || test -z "$JAR" || test -z "$JAVADOC"],
+            # Check to see if we have all 3 programs.
+            AS_IF([test -z "$JAVAC" || test -z "$JAR" || test -z "$JAVADOC"],
                   [opal_java_happy=no
                    HAVE_JAVA_SUPPORT=0],
                   [opal_java_happy=yes

ompi/mpi/java/java/Makefile.am

@@ -4,6 +4,8 @@
 # Copyright (c) 2015      Los Alamos National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
+# Copyright (c) 2018      Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -102,10 +104,6 @@ OMPI_V_JAVAC = $(ompi__v_JAVAC_$V)
 ompi__v_JAVAC_ = $(ompi__v_JAVAC_$AM_DEFAULT_VERBOSITY)
 ompi__v_JAVAC_0 = @echo "  JAVAC   " `basename $@`;
 
-OMPI_V_JAVAH = $(ompi__v_JAVAH_$V)
-ompi__v_JAVAH_ = $(ompi__v_JAVAH_$AM_DEFAULT_VERBOSITY)
-ompi__v_JAVAH_0 = @echo "  JAVAH   " `basename $@`;
-
 OMPI_V_JAR = $(ompi__v_JAR_$V)
 ompi__v_JAR_ = $(ompi__v_JAR_$AM_DEFAULT_VERBOSITY)
 ompi__v_JAR_0 = @echo "    JAR   " `basename $@`;
@@ -149,10 +147,10 @@ mpi/MPI.class: $(JAVA_SRC_FILES)
 # token mpi/MPI.class file.  Hence, all the classes will be generated
 # first, then we'll individually generate each of the .h files.
 $(JAVA_H): mpi/MPI.class
-	$(OMPI_V_JAVAH) sourcename=mpi.`echo $@ | sed -e s/^mpi_// -e s/.h$$//`; \
+	$(OMPI_V_JAVAC) sourcename=$(top_srcdir)/ompi/mpi/java/java/`echo $@ | sed -e s/^mpi_// -e s/.h$$//`.java; \
 	CLASSPATH=. ; \
 	export CLASSPATH ; \
-	$(JAVAH) -d . -jni $$sourcename
+	$(JAVAC) -h . $$sourcename
 
 # Generate the .jar file from all the class files.  List mpi/MPI.class
 # as a dependency so that it fires the rule above that will generate