Index: /issm/trunk-jpl/externalpackages/autotools/install-win.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/autotools/install-win.sh	(revision 23411)
+++ /issm/trunk-jpl/externalpackages/autotools/install-win.sh	(revision 23412)
@@ -2,77 +2,6 @@
 set -eu
 
-AUTOCONF_VER="2.69"
-AUTOMAKE_MIN_VER="1.16"
-AUTOMAKE_BUILD_VER="${AUTOMAKE_MIN_VER}.1"
-LIBTOOL_VER="2.4.2"
-M4_VER="1.4.17"
-
-AUTOCONF="autoconf-${AUTOCONF_VER}"
-AUTOMAKE="automake-${AUTOMAKE_BUILD_VER}"
-LIBTOOL="libtool-${LIBTOOL_VER}"
-M4="m4-${M4_VER}"
-
-AUTOCONF_TARBALL="${AUTOCONF}.tar.gz"
-AUTOMAKE_TARBALL="${AUTOMAKE}.tar.gz"
-LIBTOOL_TARBALL="${LIBTOOL}.tar.gz"
-M4_TARBALL="${M4}.tar.gz"
-
-# Clean up existing assets
-rm -rf install src
-
-# Set up for installation
-mkdir install
-export PATH="$ISSM_DIR/externalpackages/autotools/install/bin:$PATH"
-
-# Install m4
-echo " === INSTALLING M4 =="
-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${M4_TARBALL}" $M4_TARBALL
-tar -zxvf $M4_TARBALL
-rm -f $M4_TARBALL
-mv $M4 src
-cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
-make install
-cd ..
-
-# Install autoconf
-echo " === INSTALLING AUTOCONF =="
-rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${AUTOCONF_TARBALL}" $AUTOCONF_TARBALL
-tar -zxvf $AUTOCONF_TARBALL
-rm -f $AUTOCONF_TARBALL
-mv $AUTOCONF src
-cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
-make install
-cd ..
-
-# Install automake
-echo " === INSTALLING AUTOMAKE =="
-rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${AUTOMAKE_TARBALL}" $AUTOMAKE_TARBALL
-tar -zxvf $AUTOMAKE_TARBALL
-rm -f $AUTOMAKE_TARBALL
-mv $AUTOMAKE src
-cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
-make install
-cd ..
-
-# Install libtool
-echo " === INSTALLING LIBTOOL =="
-rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${LIBTOOL_TARBALL}" $LIBTOOL_TARBALL
-tar -zxvf $LIBTOOL_TARBALL
-rm -f $LIBTOOL_TARBALL
-mv $LIBTOOL src
-cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
-make install
-cd ..
+#Do a regular install first, and patch after
+./install.sh
 
 # This patch takes care of removing options passed to the linker that causes
Index: /issm/trunk-jpl/externalpackages/autotools/install.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/autotools/install.sh	(revision 23411)
+++ /issm/trunk-jpl/externalpackages/autotools/install.sh	(revision 23412)
@@ -2,15 +2,22 @@
 set -eu
 
-rm -rf install
+#Version numbers
+M4_VER="1.4.17"
+AUTOCONF_VER="2.69"
+AUTOMAKE_VER="1.16.1"
+LIBTOOL_VER="2.4.2"
+
+# Clean up existing directories
+rm -rf install src
+
+# Set up for installation
 mkdir install
-
 export PATH="$ISSM_DIR/externalpackages/autotools/install/bin:$PATH"
 
-#install m4
+# Install m4
 echo " === INSTALLING M4 =="
-rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/m4-1.4.17.tar.gz' 'm4-1.4.17.tar.gz'
-tar -zxvf m4-1.4.17.tar.gz
-mv m4-1.4.17 src
+$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/m4-$M4_VER.tar.gz" "m4-$M4_VER.tar.gz"
+tar -zxvf m4-$M4_VER.tar.gz
+mv m4-$M4_VER src
 cd src
 ./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
@@ -22,10 +29,10 @@
 echo " === INSTALLING AUTOCONF =="
 rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/autoconf-2.69.tar.gz' 'autoconf-2.69.tar.gz'
-tar -zxvf autoconf-2.69.tar.gz
-mv autoconf-2.69 src
+$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/autoconf-$AUTOCONF_VER.tar.gz" "autoconf-$AUTOCONF_VER.tar.gz"
+tar -zxvf autoconf-$AUTOCONF_VER.tar.gz
+mv autoconf-$AUTOCONF_VER src
 cd src 
 ./configure --prefix="$ISSM_DIR/externalpackages/autotools/install" 
-make  
+make
 make install
 cd ..
@@ -34,10 +41,10 @@
 echo " === INSTALLING AUTOMAKE =="
 rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/automake-1.16.1.tar.gz' 'automake-1.16.1.tar.gz'
-tar -zxvf  automake-1.16.1.tar.gz
-mv automake-1.16.1 src
+$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/automake-$AUTOMAKE_VER.tar.gz" "automake-$AUTOMAKE_VER.tar.gz"
+tar -zxvf  automake-$AUTOMAKE_VER.tar.gz
+mv automake-$AUTOMAKE_VER src
 cd src 
 ./configure --prefix="$ISSM_DIR/externalpackages/autotools/install" 
-make  
+make
 make install
 cd ..
@@ -46,11 +53,11 @@
 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'
-tar -zxvf  libtool-2.4.2.tar.gz
-rm libtool-2.4.2.tar.gz
-mv libtool-2.4.2 src
+$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/libtool-$LIBTOOL_VER.tar.gz" "libtool-$LIBTOOL_VER.tar.gz"
+tar -zxvf  libtool-$LIBTOOL_VER.tar.gz
+rm libtool-$LIBTOOL_VER.tar.gz
+mv libtool-$LIBTOOL_VER src
 cd src 
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install" 
-make  
+./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
+make
 make install
 cd ..