diff -ur pl-5.6.0.orig/packages/jpl/ac/ac_jni_include_dirs.m4 pl-5.6.0/packages/jpl/ac/ac_jni_include_dirs.m4 --- pl-5.6.0.orig/packages/jpl/ac/ac_jni_include_dirs.m4 2004-10-29 09:02:36.000000000 +1300 +++ pl-5.6.0/packages/jpl/ac/ac_jni_include_dirs.m4 2005-12-25 08:30:25.000000000 +1300 @@ -54,15 +54,22 @@ done case "$host_cpu" in - i?86) _JNI_LIBDIRS="i386" - ;; - *) _JNI_LIBDIRS="" + i?86) _JNI_LIBDIRS="lib/i386" + _JNI_LIBSUBDIR="client" + ;; + x86_64) _JNI_LIBDIRS="lib/amd64" + _JNI_LIBSUBDIR="client" + ;; + powerpc) _JNI_LIBDIRS="bin" + _JNI_LIBSUBDIR="classic" + ;; + *) _JNI_LIBDIRS="" esac for d in $_JNI_LIBDIRS; do - echo "Trying $_JTOPDIR/jre/lib/$d/client" - if test -d $_JTOPDIR/jre/lib/$d/client; then - JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/lib/$d/client $_JTOPDIR/jre/lib/$d" + echo "Trying $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR" + if test -d $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR; then + JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR $_JTOPDIR/jre/$d" fi done diff -ur pl-5.6.0.orig/packages/jpl/configure.in pl-5.6.0/packages/jpl/configure.in --- pl-5.6.0.orig/packages/jpl/configure.in 2005-01-31 23:47:37.000000000 +1300 +++ pl-5.6.0/packages/jpl/configure.in 2005-12-25 07:35:36.000000000 +1300 @@ -89,13 +89,16 @@ ;; esac +AC_CANONICAL_HOST dnl needed to get $host_os + +if test "$host_cpu" = powerpc; then + JAVALIBS=`echo $JAVALIBS | sed 's/-lverify//'` +fi dnl ================================================================ dnl Java stuff dnl ================================================================ -AC_CANONICAL_HOST dnl needed to get $host_os - m4_include([ac/ac_prog_javac.m4]) m4_include([ac/ac_prog_javac_works.m4]) m4_include([ac/ac_jni_include_dirs.m4])