diff options
| -rwxr-xr-x | bootstrap | 16 | ||||
| m--------- | gnulib | 0 |
2 files changed, 9 insertions, 7 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-09-30.21; # UTC +scriptversion=2010-10-05.14; # UTC # Bootstrap this package from checked-out sources. @@ -351,7 +351,7 @@ check_versions() { app=libtoolize fi # Honor $APP variables ($TAR, $AUTOCONF, etc.) - appvar=`echo $app | tr '[a-z]' '[A-Z]'` + appvar=`echo $app | tr 'a-z-' 'A-Z_'` test "$appvar" = TAR && appvar=AMTAR eval "app=\${$appvar-$app}" inst_ver=$(get_version $app) @@ -374,7 +374,7 @@ check_versions() { print_versions() { echo "Program Min_version" echo "----------------------" - printf "$buildreq" + printf %s "$buildreq" echo "----------------------" # can't depend on column -t } @@ -392,10 +392,12 @@ if test $use_libtool = 1; then fi if ! printf "$buildreq" | check_versions; then - test -f README-prereq && - echo "See README-prereq for notes on obtaining these prerequisite programs:" >&2 - echo - print_versions + echo >&2 + if test -f README-prereq; then + echo "See README-prereq for notes on obtaining the prerequisite programs" >&2 + else + echo "Please install the prerequisite programs" >&2 + fi exit 1 fi diff --git a/gnulib b/gnulib -Subproject 7c2e36888a6f0d63557fc2b98a8c8f3d3cb73aa +Subproject ae0a6b2df106b7ed760cc393312997adf995cc3 |