--- pl-5.6.57/packages/jpl/configure	2008-06-20 11:19:03.000000000 +0100
+++ /home/mef/rpmbuild/BUILD/pl-5.6.57/packages/jpl/configure	2008-07-02 14:11:55.000000000 +0100
@@ -3658,21 +3658,6 @@
     CWFLAGS="${CWFLAGS-}"
 fi
 
-if test "x$JAVALIBS" = "x"; then
-  case "$PLARCH" in
-     *darwin*)
-	  JAVALIBS="-Wl,-framework,JavaVM"
-	  ;;
-     *powerpc-linux*)
-	  JAVALIBS="-ljava -ljvm"
-	  ;;
-     *)
-	  JAVALIBS="-ljava -lverify -ljvm"
-	  ;;
-  esac
-fi
-
-
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@@ -4572,6 +4557,7 @@
         { echo "$as_me:$LINENO: checking symlink for $_cur" >&5
 echo $ECHO_N "checking symlink for $_cur... $ECHO_C" >&6; }
         _slink=`ls -ld "$_cur" | sed 's/.* -> //'`
+        if [ `basename $_slink` = "ecj" ]; then break; fi
         case "$_slink" in
         /*) _cur="$_slink";;
         # 'X' avoids triggering unwanted echo options.
@@ -4629,19 +4615,37 @@
 		_JNI_LIBSUBDIR="server"
 		;;
 	powerpc)
-		case "$host_os" in
-		linux*)
-			_JNI_LIBDIRS="bin"
-			_JNI_LIBSUBDIR="classic"
-			;;
-		*)
-			_JNI_LIBDIRS=""
-		esac
+		_JNI_LIBDIRS="lib/ppc"
+		_JNI_LIBSUBDIR="server"
+		;;
+	powerpc64)
+		_JNI_LIBDIRS="lib/ppc64"
+		_JNI_LIBSUBDIR="server"
 		;;
 	*)
 		_JNI_LIBDIRS=""
 esac
 
+# Set JAVALIBS differently if we're using GCJ
+if test "x$JAVALIBS" = "x"; then
+    if (echo $_JTOPDIR | grep gcj > /dev/null); then
+        JAVALIBS="-ljvm"
+    else
+        case "$PLARCH" in
+            *darwin*)
+            JAVALIBS="-Wl,-framework,JavaVM"
+            ;;
+            *powerpc-linux*)
+            JAVALIBS="-ljava -ljvm"
+            ;;
+            *)
+            JAVALIBS="-ljava -lverify -ljvm"
+            ;;
+        esac
+    fi
+fi
+
+
 for d in $_JNI_LIBDIRS; do
 	echo "Trying $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR"
 	if test -d $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR; then