Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autoconf/install.sh
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autoconf/install.sh	(revision 13155)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autoconf/install.sh	(revision 13156)
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-#Some cleanup
-rm -rf install autoconf-2.68 src
-
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/autoconf-2.68.tar.gz' 'autoconf-2.68.tar.gz'
-
-#Create install directories
-mkdir install
-
-#Untar 
-tar -zxvf autoconf-2.68.tar.gz
-
-#Move autoconf into src directory
-mv autoconf-2.68 src
-
-#Compile autoconf
-cd src 
-./configure --prefix="$ISSM_DIR/externalpackages/autoconf/install" 
-make  
-make install
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/libtool/install.sh
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/libtool/install.sh	(revision 13155)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/libtool/install.sh	(revision 13156)
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-#Some cleanup
-rm -rf install libtool[\w.- ]* src
-mkdir install
-
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/libtool-2.4.2.tar.gz' 'libtool-2.4.2.tar.gz'
-
-#Untar 
-tar -zxvf  libtool-2.4.2.tar.gz
-rm libtool-2.4.2.tar.gz
-
-#Move libtool into src directory
-mv libtool-2.4.2 src
-
-#Compile libtool
-cd src 
-./configure --prefix="$ISSM_DIR/externalpackages/libtool/install" 
-make  
-make install
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/automake/install.sh
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/automake/install.sh	(revision 13155)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/automake/install.sh	(revision 13156)
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-#Some cleanup
-rm -rf install automake-1.11.3 src
-
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/automake-1.11.3.tar.gz' 'automake-1.11.3.tar.gz'
-
-#Create install directories
-mkdir install
-
-#Untar 
-tar -zxvf  automake-1.11.3.tar.gz
-mv automake-1.11.3 src
-
-#Compile automake
-cd src 
-./configure --prefix="$ISSM_DIR/externalpackages/automake/install" 
-make  
-make install
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autotools/install.sh
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autotools/install.sh	(revision 0)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autotools/install.sh	(revision 13156)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+rm -rf install
+
+#install autoconf
+echo " === INSTALLING AUTOCONF =="
+rm -rf src
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/autoconf-2.68.tar.gz' 'autoconf-2.68.tar.gz'
+mkdir install
+tar -zxvf autoconf-2.68.tar.gz
+mv autoconf-2.68 src
+cd src 
+./configure --prefix="$ISSM_DIR/externalpackages/autotools/install" 
+make  
+make install
+
+#install automake
+echo " === INSTALLING AUTOMAKE =="
+rm -rf src
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/automake-1.11.3.tar.gz' 'automake-1.11.3.tar.gz'
+mkdir install
+tar -zxvf  automake-1.11.3.tar.gz
+mv automake-1.11.3 src
+cd src 
+./configure --prefix="$ISSM_DIR/externalpackages/autotools/install" 
+make  
+make install
+
+#install libtool
+echo " === INSTALLING LIBTOOL =="
+rm -rf src
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/libtool-2.4.2.tar.gz' 'libtool-2.4.2.tar.gz'
+mkdir install
+tar -zxvf  libtool-2.4.2.tar.gz
+rm libtool-2.4.2.tar.gz
+mv libtool-2.4.2 src
+cd src 
+./configure --prefix="$ISSM_DIR/externalpackages/autotools/install" 
+make  
+make install

Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autotools/install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/scripts/automakererun.sh
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/scripts/automakererun.sh	(revision 13155)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/scripts/automakererun.sh	(revision 13156)
@@ -8,4 +8,4 @@
 # If all goes well, then the script will be shortened in the future.
 
 cd $ISSM_DIR
-autoreconf -iv -I externalpackages/libtool/install/share/aclocal
+autoreconf -iv 
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.csh
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.csh	(revision 13155)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.csh	(revision 13156)
@@ -53,24 +53,12 @@
 	setenv PATH {$PATH}:{$DOXYGEN_DIR}/bin
 endif
 
-#AUTOCONF
-set AUTOCONF_DIR="$ISSM_DIR/externalpackages/autoconf/install"
-if (-d $AUTOCONF_DIR) then
-	setenv PATH {$AUTOCONF_DIR}/bin:{$PATH}
+#AUTOTOOLS
+set AUTOTOOLS_DIR="$ISSM_DIR/externalpackages/autotools/install"
+if (-d $AUTOTOOLS_DIR) then
+	setenv PATH {$AUTOTOOLS_DIR}/bin:{$PATH}
 endif
 
-#AUTOMAKE
-set AUTOMAKE_DIR="$ISSM_DIR/externalpackages/automake/install"
-if (-d $AUTOMAKE_DIR) then
-	setenv PATH {$AUTOMAKE_DIR}/bin:{$PATH}
-endif
-
-#LIBTOOL
-set LIBTOOL_DIR="$ISSM_DIR/externalpackages/libtool/install"
-if (-d $LIBTOOL_DIR) then
-	setenv PATH {$LIBTOOL_DIR}/bin:{$PATH}
-endif
-
 #SSH
 set SSH_DIR="$ISSM_DIR/externalpackages/ssh"
 if (-d $SSH_DIR) then
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh	(revision 13155)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh	(revision 13156)
@@ -85,15 +85,9 @@
 DOXYGEN_DIR="$ISSM_DIR/externalpackages/doxygen/install"
 pathappend "$DOXYGEN_DIR/bin"
 
-AUTOCONF_DIR="$ISSM_DIR/externalpackages/autoconf/install"
-pathprepend "$AUTOCONF_DIR/bin"
+AUTOTOOLS_DIR="$ISSM_DIR/externalpackages/autotools/install"
+pathprepend "$AUTOTOOLS_DIR/bin"
 
-AUTOMAKE_DIR="$ISSM_DIR/externalpackages/automake/install"
-pathprepend "$AUTOMAKE_DIR/bin"
-
-LIBTOOL_DIR="$ISSM_DIR/externalpackages/libtool/install"
-pathprepend "$LIBTOOL_DIR/bin"
-
 SDK_DIR="C:/MicrosoftVisualStudio 9.0/Microsoft Visual C++ 2008 Express Edition with SP1 - ENU"
 pathappend "$SDK_DIR"
 
