From 0259f6f9a9fb7f9366218711081d5638cc5f0504 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 5 Oct 2010 09:42:06 -0600 Subject: [PATCH] bootstrap: fix Solaris regression MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * build-aux/bootstrap (check_versions): Solaris tr still needs [] around ranges. Reported by Pádraig Brady. Signed-off-by: Eric Blake --- ChangeLog | 9 ++++++++- build-aux/bootstrap | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76d3d015bd..e37577afc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,14 @@ +2010-10-05 Eric Blake + + bootstrap: fix Solaris regression + * build-aux/bootstrap (check_versions): Solaris tr still needs [] + around ranges. + Reported by Pádraig Brady. + 2010-10-05 Eric Blake bootstrap: work with pkg-config - * build-aux/bootstrap (found_aux_dir): Also transliterate - in + * build-aux/bootstrap (check_versions): Also transliterate - in prerequisite name. (print_versions): Be robust to any \ in $buildreq. Avoid listing prerequisites that were already found, to avoid confusion. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 29802a1315..49b1e55125 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-10-05.14; # UTC +scriptversion=2010-10-05.15; # 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) -- 2.30.2