File admin-no-hpi.diff of Package kdebindings3-java

Overview Repositories Revisions Requests Users Attributes Meta

File admin-no-hpi.diff of Package kdebindings3-java

Index: admin/acinclude.m4.in
===================================================================
--- admin/acinclude.m4.in	(revision 628197)
+++ admin/acinclude.m4.in	(working copy)
@@ -5176,7 +5176,6 @@ if test "x$ac_java_dir" = "xno"; then
    kde_java_includedir=no
    kde_java_libjvmdir=no
    kde_java_libgcjdir=no
-   kde_java_libhpidir=no
 else
   if test "x$ac_java_dir" = "x"; then
      
@@ -5262,8 +5261,6 @@ if test "x$kde_java_bindir" != "xno"; th
   kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
   dnl Look for libgcj.so
   kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
-  dnl Look for libhpi.so and avoid green threads
-  kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
 
   dnl Now check everything's fine under there
   dnl the include dir is our flag for having the JDK
@@ -5312,14 +5309,6 @@ if test "x$kde_java_bindir" != "xno"; th
       AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
   fi
 
-  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
@@ -5356,8 +5345,8 @@ if test "x$kde_java_bindir" != "xno"; th
     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
+      JVMLIBS="-L$kde_java_libjvmdir -ljvm"
     else
       JVMLIBS="-L$kde_java_libgcjdir -lgcj"
     fi

Places

File admin-no-hpi.diff of Package kdebindings3-java

Places