Allow build to proceed even if libhpi.so is not present

pull/1/head
Timothy Pearson 12 年前
父节点 ac762db5a0
当前提交 efdff81cd2

@ -5810,12 +5810,6 @@ if test "x$kde_java_bindir" != "xno"; then
dnl not needed for gcj compile
if test "x$kde_java_libgcjdir" = "x"; then
if test ! -r "$kde_java_libhpidir/libhpi.so"; then
AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
fi
fi
if test -n "$jni_includes"; then
dnl Check for JNI version
AC_LANG_SAVE
@ -5852,8 +5846,12 @@ if test "x$kde_java_bindir" != "xno"; then
JAVAH=$kde_java_bindir/javah
JAR=$kde_java_bindir/jar
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
if test "x$kde_java_libgcjdir" = "x"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
if test "x$kde_java_libgcjdir" = "x"; then
if test ! -r "$kde_java_libhpidir/libhpi.so"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm"
else
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
fi
else
JVMLIBS="-L$kde_java_libgcjdir -lgcj"
fi

正在加载...
取消
保存