summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-14 20:10:44 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-14 20:10:44 -0500
commitefdff81cd246d0737ecb1a82ef6fd588c0a6bc08 (patch)
tree08ab36385ab44ac87a2f9718223a26ec51dc3693
parentac762db5a07d3ab5909e058f7051d82aef384224 (diff)
downloadadmin-efdff81cd246d0737ecb1a82ef6fd588c0a6bc08.tar.gz
admin-efdff81cd246d0737ecb1a82ef6fd588c0a6bc08.zip
Allow build to proceed even if libhpi.so is not present
-rw-r--r--acinclude.m4.in14
1 files changed, 6 insertions, 8 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in
index cbff165..2cd6be6 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -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