diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-09-14 20:10:44 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-10-13 14:21:00 +0200 |
| commit | daca7919fe3db3dce77ff3a0aa39ba7508608b1a (patch) | |
| tree | de2f87a855e4174c9c1a20d84ef4272683a25c05 | |
| parent | dcb06c93597c65cebdfeb257588aaaa8b7c62ffd (diff) | |
| download | admin-daca7919fe3db3dce77ff3a0aa39ba7508608b1a.tar.gz admin-daca7919fe3db3dce77ff3a0aa39ba7508608b1a.zip | |
Allow build to proceed even if libhpi.so is not present
(cherry picked from commit efdff81cd246d0737ecb1a82ef6fd588c0a6bc08)
| -rw-r--r-- | acinclude.m4.in | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index b45312b..432d334 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -5726,12 +5726,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 @@ -5768,8 +5762,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 |