changeset 6:c90f69dd8ad9 draft

Uploaded
author iuc
date Wed, 29 Oct 2014 10:35:32 -0400
parents 2a074c7b442e
children 72916c3412bb
files tool_dependencies.xml
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Feb 24 04:05:20 2014 -0500
+++ b/tool_dependencies.xml	Wed Oct 29 10:35:32 2014 -0400
@@ -2,7 +2,7 @@
 <tool_dependency>
     <!-- TODO: Add more dependencies to support other image formats -->
     <package name="libpng" version="1.6.7">
-        <repository changeset_revision="a0b0e0281cc4" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="libgd" version="2.1.0">
         <install version="1.0">
@@ -10,20 +10,18 @@
                 <action type="download_by_url">https://bitbucket.org/libgd/gd-libgd/downloads/libgd-2.1.0.tar.gz</action>
 
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="a0b0e0281cc4" name="package_libpng_1_6_7" owner="devteam" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="libpng" version="1.6.7" />
                     </repository>
                 </action>
 
-                <!-- action type="autoconf" can replace the following:
-                 <action type="shell_command">./configure /-prefix=$INSTALL_DIR /-with-png=$LIBPNG_ROOT_DIR; make ; make install </action>
-                -->
                 <action type="autoconf">--with-png=$LIBPNG_ROOT_DIR</action>
 
                 <action type="set_environment">
                     <environment_variable action="prepend_to" name="LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
                     <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
                     <environment_variable action="prepend_to" name="CPLUS_INCLUDE_PATH">$INSTALL_DIR/include</environment_variable>
+                    <environment_variable action="prepend_to" name="C_INCLUDE_PATH">$INSTALL_DIR/include</environment_variable>
                     <environment_variable action="set_to" name="LIBGD_ROOT_PATH">$INSTALL_DIR</environment_variable>
                 </action>
             </actions>