--- R-2.10.1/m4/clibs.m4.orig	Tue Mar 25 13:26:17 2008
+++ R-2.10.1/m4/clibs.m4	Thu Dec 17 02:07:03 2009
@@ -186,14 +186,15 @@
 # We only consider "LD_RUN_PATH" on Solaris systems.  If this is seen,
 # then we insist that the "run path" must be an absolute path (i.e. it
 # must begin with a "/").
-case `(uname -sr) 2>/dev/null` in
-   "SunOS 5"*)
-      r_ld_run_path=`echo $r_c_v_output |
-                        sed -n 's,^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$,-R\1,p'`
-      test "x$r_ld_run_path" != x &&
-        _AC_LINKER_OPTION([$r_ld_run_path], r_cv_c_libs)
-      ;;
-esac
+#stupid stuff
+#case `(uname -sr) 2>/dev/null` in
+#   "SunOS 5"*)
+#      r_ld_run_path=`echo $r_c_v_output |
+#                        sed -n 's,^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$,-R\1,p'`
+#      test "x$r_ld_run_path" != x &&
+#        _AC_LINKER_OPTION([$r_ld_run_path], r_cv_c_libs)
+#      ;;
+#esac
 fi # test "x$CLIBS" = "x"
 ])
 CLIBS=
--- R-2.10.1/etc/ldpaths.in.orig	Wed Sep 13 17:26:51 2006
+++ R-2.10.1/etc/ldpaths.in	Fri Feb 19 03:57:39 2010
@@ -1,12 +1,16 @@
-: ${JAVA_HOME=@JAVA_HOME@}
+: ${STUDIO_HOME:=@STUDIO_HOME@}
+: ${OPAL_PREFIX:=@OPAL_PREFIX@}
+: ${JAVA_HOME:=@JAVA_HOME@}
 : ${R_JAVA_LD_LIBRARY_PATH=@R_JAVA_LD_LIBRARY_PATH@}
 : ${R_LD_LIBRARY_PATH=${R_HOME}/lib@R_ARCH@:@R_LD_LIBRARY_PATH@}
 if test -n "${R_JAVA_LD_LIBRARY_PATH}"; then
   R_LD_LIBRARY_PATH="${R_LD_LIBRARY_PATH}:${R_JAVA_LD_LIBRARY_PATH}"
 fi
-if test -z "${@shlibpath_var@}"; then
-  @shlibpath_var@="${R_LD_LIBRARY_PATH}"
-else
+if test -n "${@shlibpath_var@_64}"; then
+  @shlibpath_var@_64="${R_LD_LIBRARY_PATH}:${@shlibpath_var@_64}"
+elif test -n "${@shlibpath_var@}"; then
   @shlibpath_var@="${R_LD_LIBRARY_PATH}:${@shlibpath_var@}"
+else
+  @shlibpath_var@="${R_LD_LIBRARY_PATH}"
 fi
 export @shlibpath_var@