[issm-svn] r22023 - in issm/trunk: aux-config externalpackages/autotools

[dlcheng at issm.ess.uci.edu]

Author: dlcheng
Date: 2017-08-30 12:42:49 -0700 (Wed, 30 Aug 2017)
New Revision: 22023

Modified:
   issm/trunk/aux-config/ar-lib
   issm/trunk/externalpackages/autotools/install-win.sh
Log:
CHG: Fixing windows linking errors due to carriage return characters by removing them in ar-lib. Installing m4 by default in autotool/install-win.sh.

Modified: issm/trunk/aux-config/ar-lib
===================================================================
--- issm/trunk/aux-config/ar-lib	2017-08-29 20:54:42 UTC (rev 22022)
+++ issm/trunk/aux-config/ar-lib	2017-08-30 19:42:49 UTC (rev 22023)
@@ -226,7 +226,7 @@
   else
     $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
     do
-      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+      $AR -NOLOGO -EXTRACT:"$(echo $member | tr -d '\r')" "$archive" || exit $?
     done
   fi
 

Modified: issm/trunk/externalpackages/autotools/install-win.sh
===================================================================
--- issm/trunk/externalpackages/autotools/install-win.sh	2017-08-29 20:54:42 UTC (rev 22022)
+++ issm/trunk/externalpackages/autotools/install-win.sh	2017-08-30 19:42:49 UTC (rev 22023)
@@ -6,6 +6,18 @@
 
 export PATH="$ISSM_DIR/externalpackages/autotools/install/bin:$PATH"
 
+#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
+cd src
+./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
+make
+make install
+cd ..
+
 #install autoconf
 echo " === INSTALLING AUTOCONF =="
 rm -rf src