]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
look for "jni.h" in gcj-jdk path, needed to find "jni.h" with gcj-jdk_4.9.0
authorDmitry Smirnov <onlyjob@member.fsf.org>
Mon, 12 May 2014 03:57:20 +0000 (13:57 +1000)
committerSage Weil <sage@inktank.com>
Tue, 20 May 2014 22:22:01 +0000 (15:22 -0700)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
(cherry picked from commit 0f4120c0115e7977ae7c03458addcc2b2916db07)

configure.ac

index 36312cf2b01ab065640b823f8d9c1e8e809c1837..8a467c165f7c2a7617b4b2afedc9c0da74eba08e 100644 (file)
@@ -392,7 +392,7 @@ if test "x$enable_cephfs_java" = "xyes"; then
        # setup defaults for Debian default-jdk package (without --with-jdk-dir)
        AS_IF([test -z "$with_jdk_dir"], [
                   # This works with Debian's and CentOS' default-jdk package
-       for dir in '/usr/lib/jvm/default-java/' '/usr/lib/jvm/java/' ; do
+       for dir in '/usr/lib/jvm/default-java/' '/usr/lib/jvm/java/' '/usr/lib/jvm/java-gcj/'; do
           # only test if a suitable path has not yet been found
           AS_IF([test "$EXTRA_JDK_BIN_DIR" == ""], [
                          AS_IF([test -x "$javac_prog"], [