makefile: use javac for creating JNI headers

JDK 1.10 does not offer javah anymore, so we need to use "javac -h"
instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit edc504b9d446cc1739f3e8e087914cfe66d6cac3)
Conflicts: configure.ac:
           src/java/Makefile.am: we don't use cmake back in jewel, so
port the cmake changes to autotools.

diff --git a/configure.ac b/configure.ac
index b293a49e71f408699a0dc38a6f8f667e9cb15a3a..e1a31cfe410dfeea9383983caf25c4485952a437 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -746,6 +746,7 @@ if test "x$enable_cephfs_java" = "xyes"; then
        # Setup output var
        AC_SUBST(JDK_CPPFLAGS)
 fi
+AM_CONDITIONAL(HAVE_JAVAH, [test -n "$JAVAH"])
 AM_CONDITIONAL(HAVE_JUNIT4, [test "$have_junit4" = "1"])
 
 #

diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index 5481e64bd4f99410c48a120f5cd34e5d3dd6c27c..fad77a45baa1359fdfe6f1c70a826d298570329a 100644 (file)
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -45,6 +45,7 @@ CEPH_PROXY=java/com/ceph/fs/CephMount.class
 # as per
 #   https://blogs.oracle.com/darcy/entry/bootclasspath_older_source
 
+if HAVE_JAVAH
 $(CEPH_PROXY): $(JAVA_SRC)
        export CLASSPATH=java/ ; \
        $(JAVAC) -classpath java -source 1.5 -target 1.5 -Xlint:-options java/com/ceph/fs/*.java
@@ -52,6 +53,14 @@ $(CEPH_PROXY): $(JAVA_SRC)
 $(JAVA_H): $(CEPH_PROXY)
        export CLASSPATH=java/ ; \
        $(JAVAH) -classpath java -jni -o $@ com.ceph.fs.CephMount
+else
+$(CEPH_PROXY): $(JAVA_SRC)
+       export CLASSPATH=java/ ; \
+       $(JAVAC) -classpath java -source 1.5 -target 1.5 -Xlint:-options -h native java/com/ceph/fs/*.java
+
+$(JAVA_H): $(CEPH_PROXY)
+endif # HAVE_JAVAH
+
 
 libcephfs.jar: $(CEPH_PROXY)
        $(JAR) cf $@ $(JAVA_CLASSES:%=-C java %)