File kdebindings-3.0.0-gcjjava.patch of Package kmozilla

Overview Repositories Revisions Requests Users Attributes Meta

File kdebindings-3.0.0-gcjjava.patch of Package kmozilla

--- kdebindings/admin/acinclude.m4.in.gcj	Sun Feb 10 14:08:02 2002
+++ kdebindings/admin/acinclude.m4.in	Mon Feb 18 18:54:26 2002
@@ -4534,6 +4534,16 @@
 
 dnl At this point kde_cv_java_bindir and kde_cv_java_includedir are either set or "no"
 if test "x$kde_cv_java_bindir" != "xno"; then
+  dnl Check if java is actually gcj - some other checks have to be different.
+  AC_MSG_CHECKING(if java is gcj)
+  AC_TRY_COMPILE([#include "$kde_cv_java_includedir/jni.h"],
+    [ #ifndef __GCJ_JNI_H__
+      #  error This is not gcj
+      #endif],
+    [ AC_MSG_RESULT(yes)
+      AC_DEFINE(GCJJAVA, 1, [Define if your java is gcj])
+      ac_cv_gcjjava="yes" ],
+    [ AC_MSG_RESULT(no) ])
 
   dnl Look for libjvm.so
   kde_java_libjvmdir=`find $kde_cv_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
@@ -4554,18 +4564,21 @@
   if test ! -r "$kde_cv_java_includedir/jni.h"; then
     AC_MSG_ERROR([jni.h not found under $kde_cv_java_includedir. Use --with-java or --without-java.])
   fi
-  if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
-    AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
-  fi
-  if test ! -r "$kde_java_libhpidir/libhpi.so"; then
-    AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
-  fi
-
   jni_includes="-I$kde_cv_java_includedir"
-  dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-  dnl and under linux here..
-  test -d "$kde_cv_java_includedir/linux" && jni_includes="$jni_includes -I$kde_cv_java_includedir/linux"
-  test -d "$kde_cv_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_cv_java_includedir/genunix"
+  if test ! "x$ac_cv_gcjjava" = xyes; then
+    # gcj handles this differently.
+    if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
+      AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
+    fi
+    if test ! -r "$kde_java_libhpidir/libhpi.so"; then
+      AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
+    fi
+
+    dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
+    dnl and under linux here..
+    test -d "$kde_cv_java_includedir/linux" && jni_includes="$jni_includes -I$kde_cv_java_includedir/linux"
+    test -d "$kde_cv_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_cv_java_includedir/genunix"
+  fi
 
   dnl Check for JNI version
   AC_LANG_SAVE
@@ -4606,7 +4619,12 @@
   JAR=$kde_cv_java_bindir/jar
   AC_SUBST(JAR)
   AC_SUBST(jni_includes)
-  JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
+  if test "x$ac_cv_gcjjava" != xyes; then
+    JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
+  else
+    # gcj doesn't need these
+    JVMLIBS=""
+  fi
   AC_SUBST(JVMLIBS)
 fi
 ])

Places

File kdebindings-3.0.0-gcjjava.patch of Package kmozilla

Places