* build-aux/bootstrap (found_aux_dir): Also transliterate - in
prerequisite name.
(print_versions): Be robust to any \ in $buildreq.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
Sorry for Thunderbird's bug corrupting the formatting of Justin's mail.
> Something like:
>
> ****************************************
> $ ./autogen.sh
> running bootstrap...
> Error: 'CONFIG-pkg-config' not found
>
> Program Min_version Status
> -----------------------------------------
> autoconf 2.59 OK - 2.61 found
Hmm, looking at this further, I note that bootstrap is already doing
a loop over all of $buildreq, reporting each failure as it goes,
and then, after reporting all failures, merely reprinting the entire
list of requirements. Maybe the thing do is just leave the error
messages, and skip reprinting $buildreq; at any rate, that's simpler
than munging $buildreq to include details about the successful
version checks. So I didn't do anything about this second suggestion
on the missing pre-req output.
ChangeLog | 6 ++++++
build-aux/bootstrap | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 87559f4..a58fb3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-10-05 Eric Blake <ebl...@redhat.com>
+ bootstrap: work with pkg-config
+ * build-aux/bootstrap (found_aux_dir): Also transliterate - in
+ prerequisite name.
+ (print_versions): Be robust to any \ in $buildreq.
+ Reported by Justin Clift.
+
faccessat: remove unused wrappers
* lib/openat.h (accessat, euidaccesat): Delete, since the mere
presence of these wrappers dragged in -lgen on Solaris.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 7f0ee81..0862158 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2010-09-30.21; # UTC
+scriptversion=2010-10-05.12; # 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
}
--
1.7.2.3
