Attachment #557 for bug #978

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 978
Collapse All | Expand All




   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
     

  else
    kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
  fi
  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


  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

    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"
    else
      if test "x$JVMLIBS" = "x"; then
        if test ! -r "$kde_java_libgcjdir/libgcj.so"; then

Return to bug 978

Lines 5587-5593 Link Here

(-)kdebindings/admin/acinclude.m4.in.ORI (-10 / +1 lines)
5587	kde_java_includedir=no	5587	kde_java_includedir=no
5588	kde_java_libjvmdir=no	5588	kde_java_libjvmdir=no
5589	kde_java_libgcjdir=no	5589	kde_java_libgcjdir=no
5590	kde_java_libhpidir=no
5591	else	5590	else
5592	if test "x$ac_java_dir" = "x"; then	5591	if test "x$ac_java_dir" = "x"; then
5593		5592
Lines 5685-5692 Link Here
5685	else	5684	else
5686	kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so \| sed 's,libgcj.so,,'\|head -n 1`	5685	kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so \| sed 's,libgcj.so,,'\|head -n 1`
5687	fi	5686	fi
5688	dnl Look for libhpi.so and avoid green threads
5689	kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so \| grep -v green \| sed 's,libhpi.so,,' \| head -n 1`
5690		5687
5691	dnl Now check everything's fine under there	5688	dnl Now check everything's fine under there
5692	dnl the include dir is our flag for having the JDK	5689	dnl the include dir is our flag for having the JDK
Lines 5733-5744 Link Here
5733		5730
5734	dnl not needed for gcj compile	5731	dnl not needed for gcj compile
5735		5732
5736	if test "x$kde_java_libgcjdir" = "x"; then
5737	if test ! -r "$kde_java_libhpidir/libhpi.so"; then
5738	AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
5739	fi
5740	fi
5741
5742	if test -n "$jni_includes"; then	5733	if test -n "$jni_includes"; then
5743	dnl Check for JNI version	5734	dnl Check for JNI version
5744	AC_LANG_SAVE	5735	AC_LANG_SAVE
Lines 5776-5782 Link Here
5776	JAR=$kde_java_bindir/jar	5767	JAR=$kde_java_bindir/jar
5777	AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])	5768	AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
5778	if test "x$kde_java_libgcjdir" = "x"; then	5769	if test "x$kde_java_libgcjdir" = "x"; then
5779	JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"	5770	JVMLIBS="-L$kde_java_libjvmdir -ljvm"
5780	else	5771	else
5781	if test "x$JVMLIBS" = "x"; then	5772	if test "x$JVMLIBS" = "x"; then
5782	if test ! -r "$kde_java_libgcjdir/libgcj.so"; then	5773	if test ! -r "$kde_java_libgcjdir/libgcj.so"; then