Changeset 2366 for stable

Timestamp:

Jul 16, 2011 7:39:03 AM (10 years ago)

Author:

stefan

Message:

merge chgset 2362 from trunk

Location:

stable/0.6

Files:

• . (modified) (1 prop)
• compile_f2c (modified) (1 prop)
• run_autotools (modified) (3 diffs)

stable/0.6/run_autotools

@@ -107 +107 @@
 
 grep_version=`echo  $ver_autoconf | sed -e 's/\\./\\\\\\./g'`
-autoconf --version > confauto.out 2>&1
+if autoconf --version > confauto.out 2>&1 ; then : ; else
+  echo "autoconf $ver_autoconf not available"
+  rm -f confauto.out
+  exit 2
+fi
 if $EGREP $grep_version confauto.out >/dev/null 2>&1; then :; else
   echo You are not using the correct version of autoconf
@@ -122 +126 @@
 
 grep_version=`echo  $ver_automake | sed -e 's/\\./\\\\\\./g'`
-automake --version > confauto.out 2>&1
+if automake --version > confauto.out 2>&1 ; then : ; else
+  echo "automake $ver_automake not available"
+  rm -f confauto.out
+  exit 2
+fi
 if $EGREP $grep_version confauto.out >/dev/null 2>&1; then :; else
   echo You are not using the correct version of automake
@@ -142 +150 @@
 ltfile=$AUTOTOOLS_DIR/share/libtool/ltmain.sh
 if test -r $ltfile; then :; else
-  echo WARNING: Cannot file libtool shell $ltfile
+  echo WARNING: Cannot find libtool shell $ltfile
 fi
 if $EGREP $grep_version $ltfile >/dev/null 2>&1; then :; else