summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2010-10-05 08:38:22 -0600
committerEric Blake <eblake@redhat.com>2010-10-05 08:38:22 -0600
commit4c286d341a5443ca9044ac3aca3b69d941f5e531 (patch)
tree3badee8199caebefefbefa43a24da34e4be9ff53 /bootstrap
parent77063bf819f44bbae4dd057e75d23ee72c728a63 (diff)
downloadcoreutils-4c286d341a5443ca9044ac3aca3b69d941f5e531.tar.xz
build: fix build on Solaris 10
* gnulib: Update to latest, for reduced -lgen scope. * bootstrap: Synchronize from upstream. Reported by Clemens Brogi, as bug #7142.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap16
1 files changed, 9 insertions, 7 deletions
diff --git a/bootstrap b/bootstrap
index 7f0ee8128..29802a131 100755
--- a/bootstrap
+++ b/bootstrap
@@ -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