=== modified file 'm4/java.m4'
--- a/m4/java.m4	2007-12-14 18:13:30 +0000
+++ b/m4/java.m4	2008-02-14 16:30:21 +0000
@@ -22,9 +22,17 @@
       # Unwind symlinks found. This can experience infinite loop
       # so we throw in a sleep so that it won't be a cpu hog.
 
-      while test -L "$JAVA_HOME"; do
+      link=$1
+      while true
+      do
+        match=`ls -l ${link} | awk '/->/ {print $NF}'`
+        if [ -n "${match}" ]; then
+          link=$match
+        else
+          JAVA_HOME="$link"
+          break
+        fi
         sleep 1
-        JAVA_HOME="`readlink -n "$JAVA_HOME"`"
       done
 
       JAVA_HOME="`echo -n "$JAVA_HOME" | sed 's%/[[^/]]*/[[^/]]*$%%'`"
@@ -236,6 +244,9 @@
 
   AC_CACHE_CHECK([for compile flags for JNI], ac_cv_java_cxxflags,[
     case "$ac_cv_java_style-$host_os" in
+    Sun-solaris*)
+      ac_cv_java_cxxflags="-I$JAVA_INC -I$JAVA_INC/solaris"
+      ;;
     Sun-linux*)
       ac_cv_java_cxxflags="-I$JAVA_INC -I$JAVA_INC/linux"
       ;;