# HG changeset patch
# User boris
# Date 1389723054 18000
# Node ID cfb94fd355b67f8ee714331780547e8096a70404
# Parent  f6b8f51b71a22273a2cd916dfbce1b5281820300
Uploaded dave's fix

diff -r f6b8f51b71a2 -r cfb94fd355b6 tool_dependencies.xml
--- a/tool_dependencies.xml	Sun Jun 09 17:11:08 2013 -0400
+++ b/tool_dependencies.xml	Tue Jan 14 13:10:54 2014 -0500
@@ -1,24 +1,21 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="readline" version="6.2">
-        <repository changeset_revision="1301ec7705a8" name="package_readline_6_2" owner="boris" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
+  <package name="readline" version="6.2">
+      <repository changeset_revision="984448adbe79" name="package_readline_6_2" owner="boris" prior_installation_required="True" toolshed="http://gaius.bx.psu.edu:9009" />
     </package>
     <package name="R" version="2.15.0">
-        <install version="1.0">
-            <actions>
-                <action type="download_by_url">http://cran.rstudio.com/src/base/R-2/R-2.15.0.tar.gz</action>
+      <install version="1.0">
+          <actions>
+              <action type="download_by_url">http://cran.rstudio.com/src/base/R-2/R-2.15.0.tar.gz</action>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="1301ec7705a8" name="package_readline_6_2" owner="boris" toolshed="http://testtoolshed.g2.bx.psu.edu/">
-                        <package name="readline" version="6.2" />
-                    </repository>
+                  <repository changeset_revision="984448adbe79" name="package_readline_6_2" owner="boris" prior_installation_required="False" toolshed="http://gaius.bx.psu.edu:9009" />
                 </action>
                 <action type="make_directory">$INSTALL_DIR</action>
-                <action type="shell_command">./configure --with-blas --with-lapack --enable-R-shlib --with-readline=no --with-x=no --prefix=$INSTALL_DIR &amp;&amp; make &amp;&amp; make install</action>
+                <action type="shell_command">export LDFLAGS="-L$READLINE_LIBS -lreadline" &amp;&amp; ./configure --with-blas --with-lapack --enable-R-shlib --with-readline=no --with-x=no --prefix=$INSTALL_DIR &amp;&amp; make &amp;&amp; make install</action>
                 <action type="set_environment">
-                    <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable>
+                  <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable>
                     <environment_variable action="set_to" name="R_LIBS">$INSTALL_DIR/lib/R/library</environment_variable>
                     <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/lib/R/bin</environment_variable>
-
                 </action>
             </actions>
         </install>