Changeset 2366 for stable/0.6


Ignore:
Timestamp:
Jul 16, 2011 7:39:03 AM (8 years ago)
Author:
stefan
Message:

merge chgset 2362 from trunk

Location:
stable/0.6
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

    • Property svn:mergeinfo changed
      /trunkmerged: 2362
  • stable/0.6/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.6/run_autotools

    r1957 r2366  
    107107
    108108grep_version=`echo  $ver_autoconf | sed -e 's/\\./\\\\\\./g'`
    109 autoconf --version > confauto.out 2>&1
     109if autoconf --version > confauto.out 2>&1 ; then : ; else
     110  echo "autoconf $ver_autoconf not available"
     111  rm -f confauto.out
     112  exit 2
     113fi
    110114if $EGREP $grep_version confauto.out >/dev/null 2>&1; then :; else
    111115  echo You are not using the correct version of autoconf
     
    122126
    123127grep_version=`echo  $ver_automake | sed -e 's/\\./\\\\\\./g'`
    124 automake --version > confauto.out 2>&1
     128if automake --version > confauto.out 2>&1 ; then : ; else
     129  echo "automake $ver_automake not available"
     130  rm -f confauto.out
     131  exit 2
     132fi
    125133if $EGREP $grep_version confauto.out >/dev/null 2>&1; then :; else
    126134  echo You are not using the correct version of automake
     
    142150ltfile=$AUTOTOOLS_DIR/share/libtool/ltmain.sh
    143151if test -r $ltfile; then :; else
    144   echo WARNING: Cannot file libtool shell $ltfile
     152  echo WARNING: Cannot find libtool shell $ltfile
    145153fi
    146154if $EGREP $grep_version $ltfile >/dev/null 2>&1; then :; else
Note: See TracChangeset for help on using the changeset viewer.