Changeset 22023

Timestamp:

08/30/17 12:42:49 (8 years ago)

Author:

dlcheng

Message:

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.

Location:

issm/trunk

Files:

• aux-config/ar-lib (modified) (1 diff)
• externalpackages/autotools/install-win.sh (modified) (1 diff)

issm/trunk/aux-config/ar-lib ¶

@@ -227 +227 @@
     $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

issm/trunk/externalpackages/autotools/install-win.sh ¶

@@ -6 +6 @@
 
 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